Skip to content

Commit 468b87d

Browse files
committed
Merge commit 'refs/pull/36256/head' of github.com:sagemath/sage into HEAD
2 parents 5e0f997 + 905419a commit 468b87d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/ci-linux-incremental.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ jobs:
8383
tox_system_factors: >-
8484
["ubuntu-focal",
8585
"ubuntu-jammy",
86-
"ubuntu-mantic,
86+
"ubuntu-mantic",
8787
"debian-bullseye",
8888
"debian-bookworm",
89-
"ubuntu-mantic,
9089
"fedora-30",
9190
"fedora-38",
9291
"gentoo-python3.11",

build/pkgs/rpy2/spkg-configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SAGE_SPKG_CONFIGURE([rpy2], [
2-
sage_spkg_install_rpy2=yes
3-
], [dnl REQUIRED-CHECK
2+
SAGE_PYTHON_PACKAGE_CHECK([rpy2])
3+
], [dnl REQUIRED-CHECK
44
AC_REQUIRE([SAGE_SPKG_CONFIGURE_R])
55
dnl rpy2 is only needed when there is a usable system R
66
AS_VAR_IF([sage_spkg_install_r], [yes], [dnl

0 commit comments

Comments
 (0)