Release Manager · Release Manager · commit cac16e2fa5d6 · 2023-09-16T00:47:37.000+02:00
gh-36256: Support more system-site packages Add boilerplate for a few more python packages to be detected with `--enable-system-site-packages`. Marked as critical because it repairs rpy2 system package on ubuntu/debian URL: #36256 Reported by: Michael Orlitzky Reviewer(s): Dima Pasechnik, Matthias Köppe, Michael Orlitzky
diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml
@@ -83,10 +83,9 @@ jobs:
       tox_system_factors: >-
         ["ubuntu-focal",
          "ubuntu-jammy",
-         "ubuntu-mantic,
+         "ubuntu-mantic",
          "debian-bullseye",
          "debian-bookworm",
-         "ubuntu-mantic,
          "fedora-30",
          "fedora-38",
          "gentoo-python3.11",
diff --git a/build/pkgs/asttokens/distros/gentoo.txt b/build/pkgs/asttokens/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/asttokens
diff --git a/build/pkgs/asttokens/spkg-configure.m4 b/build/pkgs/asttokens/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([asttokens], [SAGE_PYTHON_PACKAGE_CHECK([asttokens])])
diff --git a/build/pkgs/contourpy/distros/gentoo.txt b/build/pkgs/contourpy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/contourpy
diff --git a/build/pkgs/contourpy/spkg-configure.m4 b/build/pkgs/contourpy/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([contourpy], [SAGE_PYTHON_PACKAGE_CHECK([contourpy])])
diff --git a/build/pkgs/cppy/distros/gentoo.txt b/build/pkgs/cppy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/cppy
diff --git a/build/pkgs/cppy/spkg-configure.m4 b/build/pkgs/cppy/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([cppy], [SAGE_PYTHON_PACKAGE_CHECK([cppy])])
diff --git a/build/pkgs/editables/distros/gentoo.txt b/build/pkgs/editables/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/editables
diff --git a/build/pkgs/editables/spkg-configure.m4 b/build/pkgs/editables/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([editables], [SAGE_PYTHON_PACKAGE_CHECK([editables])])
diff --git a/build/pkgs/executing/distros/gentoo.txt b/build/pkgs/executing/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/executing
diff --git a/build/pkgs/executing/spkg-configure.m4 b/build/pkgs/executing/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([executing], [SAGE_PYTHON_PACKAGE_CHECK([executing])])
diff --git a/build/pkgs/fonttools/distros/gentoo.txt b/build/pkgs/fonttools/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/fonttools
diff --git a/build/pkgs/fonttools/spkg-configure.m4 b/build/pkgs/fonttools/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([fonttools], [SAGE_PYTHON_PACKAGE_CHECK([fonttools])])
diff --git a/build/pkgs/gmpy2/spkg-configure.m4 b/build/pkgs/gmpy2/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([gmpy2], [SAGE_PYTHON_PACKAGE_CHECK([gmpy2])])
diff --git a/build/pkgs/hatchling/distros/gentoo.txt b/build/pkgs/hatchling/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/hatchling
diff --git a/build/pkgs/hatchling/spkg-configure.m4 b/build/pkgs/hatchling/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([hatchling], [SAGE_PYTHON_PACKAGE_CHECK([hatchling])])
diff --git a/build/pkgs/meson_python/distros/gentoo.txt b/build/pkgs/meson_python/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/meson-python
diff --git a/build/pkgs/meson_python/spkg-configure.m4 b/build/pkgs/meson_python/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([meson_python], [
+  SAGE_PYTHON_PACKAGE_CHECK([meson-python])
+])
diff --git a/build/pkgs/pathspec/distros/gentoo.txt b/build/pkgs/pathspec/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pathspec
diff --git a/build/pkgs/pathspec/spkg-configure.m4 b/build/pkgs/pathspec/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pathspec], [SAGE_PYTHON_PACKAGE_CHECK([pathspec])])
diff --git a/build/pkgs/platformdirs/distros/gentoo.txt b/build/pkgs/platformdirs/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/platformdirs
diff --git a/build/pkgs/platformdirs/spkg-configure.m4 b/build/pkgs/platformdirs/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([platformdirs], [SAGE_PYTHON_PACKAGE_CHECK([platformdirs])])
diff --git a/build/pkgs/pure_eval/distros/gentoo.txt b/build/pkgs/pure_eval/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pure_eval
diff --git a/build/pkgs/pure_eval/spkg-configure.m4 b/build/pkgs/pure_eval/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pure_eval], [SAGE_PYTHON_PACKAGE_CHECK([pure_eval])])
diff --git a/build/pkgs/pyproject_metadata/distros/gentoo.txt b/build/pkgs/pyproject_metadata/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pyproject-metadata
diff --git a/build/pkgs/pyproject_metadata/spkg-configure.m4 b/build/pkgs/pyproject_metadata/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([pyproject_metadata], [
+  SAGE_PYTHON_PACKAGE_CHECK([pyproject_metadata])
+])
diff --git a/build/pkgs/rpy2/spkg-configure.m4 b/build/pkgs/rpy2/spkg-configure.m4
@@ -1,6 +1,6 @@
 SAGE_SPKG_CONFIGURE([rpy2], [
-    sage_spkg_install_rpy2=yes
-  ], [dnl REQUIRED-CHECK
+    SAGE_PYTHON_PACKAGE_CHECK([rpy2])
+], [dnl REQUIRED-CHECK
     AC_REQUIRE([SAGE_SPKG_CONFIGURE_R])
     dnl rpy2 is only needed when there is a usable system R
     AS_VAR_IF([sage_spkg_install_r], [yes], [dnl
diff --git a/build/pkgs/stack_data/distros/gentoo.txt b/build/pkgs/stack_data/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/stack_data
diff --git a/build/pkgs/stack_data/spkg-configure.m4 b/build/pkgs/stack_data/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([stack_data], [
+  SAGE_PYTHON_PACKAGE_CHECK([stack_data])
+])
diff --git a/build/pkgs/tomlkit/distros/gentoo.txt b/build/pkgs/tomlkit/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/tomlkit
diff --git a/build/pkgs/tomlkit/spkg-configure.m4 b/build/pkgs/tomlkit/spkg-configure.m4
@@ -0,0 +1,2 @@
+SAGE_SPKG_CONFIGURE([tomlkit], [SAGE_PYTHON_PACKAGE_CHECK([tomlkit])])
+
diff --git a/build/pkgs/typing_extensions/spkg-configure.m4 b/build/pkgs/typing_extensions/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([typing_extensions],[
+  SAGE_PYTHON_PACKAGE_CHECK([typing_extensions])
+])

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([asttokens], [SAGE_PYTHON_PACKAGE_CHECK([asttokens])])`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([contourpy], [SAGE_PYTHON_PACKAGE_CHECK([contourpy])])`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([cppy], [SAGE_PYTHON_PACKAGE_CHECK([cppy])])`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([editables], [SAGE_PYTHON_PACKAGE_CHECK([editables])])`