Release Manager · Release Manager · commit f89aaf18354a · 2023-10-19T00:58:55.000+02:00
gh-36332: Yet more more spkgs confs a continuation of #36276 (more system Python packages support via `--enable-system-site-packages`) Also, added a Cython 3.0.2 patch to fix the usage of `--enable-system- site-packages` option. Without it, and sufficiently many Python system packages, sagelib won't build. (Therefore, blocker label added) URL: #36332 Reported by: Dima Pasechnik Reviewer(s): Michael Orlitzky
diff --git a/build/pkgs/appnope/spkg-configure.m4 b/build/pkgs/appnope/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([appnope], [
+  SAGE_PYTHON_PACKAGE_CHECK([appnope])
+])
diff --git a/build/pkgs/argon2_cffi_bindings/distros/alpine.txt b/build/pkgs/argon2_cffi_bindings/distros/alpine.txt
@@ -0,0 +1 @@
+py3-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/arch.txt b/build/pkgs/argon2_cffi_bindings/distros/arch.txt
@@ -0,0 +1 @@
+python-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/fedora.txt b/build/pkgs/argon2_cffi_bindings/distros/fedora.txt
@@ -0,0 +1 @@
+python-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/freebsd.txt b/build/pkgs/argon2_cffi_bindings/distros/freebsd.txt
@@ -0,0 +1 @@
+security/py-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/gentoo.txt b/build/pkgs/argon2_cffi_bindings/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/macports.txt b/build/pkgs/argon2_cffi_bindings/distros/macports.txt
@@ -0,0 +1 @@
+py-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/distros/opensuse.txt b/build/pkgs/argon2_cffi_bindings/distros/opensuse.txt
@@ -0,0 +1 @@
+python-argon2-cffi-bindings
diff --git a/build/pkgs/argon2_cffi_bindings/spkg-configure.m4 b/build/pkgs/argon2_cffi_bindings/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([argon2_cffi_bindings], [
+  SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi_bindings])
+])
diff --git a/build/pkgs/calver/distros/alpine.txt b/build/pkgs/calver/distros/alpine.txt
@@ -0,0 +1 @@
+py3-calver
diff --git a/build/pkgs/calver/distros/arch.txt b/build/pkgs/calver/distros/arch.txt
@@ -0,0 +1 @@
+python-calver
diff --git a/build/pkgs/calver/distros/freebsd.txt b/build/pkgs/calver/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-calver
diff --git a/build/pkgs/calver/distros/gentoo.txt b/build/pkgs/calver/distros/gentoo.txt
@@ -0,0 +1 @@
+calver
diff --git a/build/pkgs/calver/distros/macports.txt b/build/pkgs/calver/distros/macports.txt
@@ -0,0 +1 @@
+py-calver
diff --git a/build/pkgs/calver/distros/opensuse.txt b/build/pkgs/calver/distros/opensuse.txt
@@ -0,0 +1 @@
+python-calver
diff --git a/build/pkgs/calver/distros/package-version.txt b/build/pkgs/calver/distros/package-version.txt
@@ -0,0 +1 @@
+2022.6.26
diff --git a/build/pkgs/calver/distros/void.txt b/build/pkgs/calver/distros/void.txt
@@ -0,0 +1 @@
+python3-calver
diff --git a/build/pkgs/calver/spkg-configure.m4 b/build/pkgs/calver/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([calver], [
+  SAGE_PYTHON_PACKAGE_CHECK([calver])
+])
diff --git a/build/pkgs/cython/patches/5690.patch b/build/pkgs/cython/patches/5690.patch
@@ -0,0 +1,48 @@
+diff --git a/Cython/Debugger/DebugWriter.py b/Cython/Debugger/DebugWriter.py
+index 8b1fb75b027..2c3c310fc64 100644
+--- a/Cython/Debugger/DebugWriter.py
++++ b/Cython/Debugger/DebugWriter.py
+@@ -18,6 +18,21 @@
+             etree = None
+ 
+ from ..Compiler import Errors
++from ..Compiler.StringEncoding import EncodedString
++
++
++def is_valid_tag(name):
++    """
++    Names like '.0' are used internally for arguments
++    to functions creating generator expressions,
++    however they are not identifiers.
++
++    See https://github.com/cython/cython/issues/5552
++    """
++    if isinstance(name, EncodedString):
++        if name.startswith(".") and name[1:].isdecimal():
++            return False
++    return True
+ 
+ 
+ class CythonDebugWriter(object):
+@@ -39,14 +54,17 @@ def __init__(self, output_dir):
+         self.start('cython_debug', attrs=dict(version='1.0'))
+ 
+     def start(self, name, attrs=None):
+-        self.tb.start(name, attrs or {})
++        if is_valid_tag(name):
++            self.tb.start(name, attrs or {})
+ 
+     def end(self, name):
+-        self.tb.end(name)
++        if is_valid_tag(name):
++            self.tb.end(name)
+ 
+     def add_entry(self, name, **attrs):
+-        self.tb.start(name, attrs)
+-        self.tb.end(name)
++        if is_valid_tag(name):
++            self.tb.start(name, attrs)
++            self.tb.end(name)
+ 
+     def serialize(self):
+         self.tb.end('Module')
diff --git a/build/pkgs/cython/spkg-configure.m4 b/build/pkgs/cython/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([cython], [
+  SAGE_PYTHON_PACKAGE_CHECK([cython])
+])
diff --git a/build/pkgs/fastjsonschema/distros/alpine.txt b/build/pkgs/fastjsonschema/distros/alpine.txt
@@ -0,0 +1 @@
+py3-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/arch.txt b/build/pkgs/fastjsonschema/distros/arch.txt
@@ -0,0 +1 @@
+python-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/debian.txt b/build/pkgs/fastjsonschema/distros/debian.txt
@@ -0,0 +1 @@
+python-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/fedora.txt b/build/pkgs/fastjsonschema/distros/fedora.txt
@@ -0,0 +1 @@
+python-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/freebsd.txt b/build/pkgs/fastjsonschema/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/gentoo.txt b/build/pkgs/fastjsonschema/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/macports.txt b/build/pkgs/fastjsonschema/distros/macports.txt
@@ -0,0 +1 @@
+py-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/opensuse.txt b/build/pkgs/fastjsonschema/distros/opensuse.txt
@@ -0,0 +1 @@
+python-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/distros/void.txt b/build/pkgs/fastjsonschema/distros/void.txt
@@ -0,0 +1 @@
+python3-fastjsonschema
diff --git a/build/pkgs/fastjsonschema/spkg-configure.m4 b/build/pkgs/fastjsonschema/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([fastjsonschema], [
+  SAGE_PYTHON_PACKAGE_CHECK([fastjsonschema])
+])
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt
@@ -0,0 +1 @@
+py3-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt
@@ -0,0 +1 @@
+python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt
@@ -0,0 +1 @@
+python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt
@@ -0,0 +1 @@
+python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt
@@ -0,0 +1 @@
+py-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt b/build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt
@@ -0,0 +1 @@
+python-hatch-fancy-pypi-readme
diff --git a/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4 b/build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([hatch_fancy_pypi_readme], [
+  SAGE_PYTHON_PACKAGE_CHECK([hatch_fancy_pypi_readme])
+])
diff --git a/build/pkgs/hatch_vcs/distros/alpine.txt b/build/pkgs/hatch_vcs/distros/alpine.txt
@@ -0,0 +1 @@
+py3-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/arch.txt b/build/pkgs/hatch_vcs/distros/arch.txt
@@ -0,0 +1 @@
+python-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/debian.txt b/build/pkgs/hatch_vcs/distros/debian.txt
@@ -0,0 +1 @@
+hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/fedora.txt b/build/pkgs/hatch_vcs/distros/fedora.txt
@@ -0,0 +1 @@
+python-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/freebsd.txt b/build/pkgs/hatch_vcs/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/gentoo.txt b/build/pkgs/hatch_vcs/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/macports.txt b/build/pkgs/hatch_vcs/distros/macports.txt
@@ -0,0 +1 @@
+py-hatch-vcs
diff --git a/build/pkgs/hatch_vcs/distros/opensuse.txt b/build/pkgs/hatch_vcs/distros/opensuse.txt
@@ -0,0 +1 @@
+python-hatch_vcs
diff --git a/build/pkgs/hatch_vcs/distros/void.txt b/build/pkgs/hatch_vcs/distros/void.txt
@@ -0,0 +1 @@
+hatch-vcs
diff --git a/build/pkgs/hatch_vcs/spkg-configure.m4 b/build/pkgs/hatch_vcs/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([hatch_vcs], [
+  SAGE_PYTHON_PACKAGE_CHECK([hatch_vcs])
+])
diff --git a/build/pkgs/stack_data/distros/gentoo.txt b/build/pkgs/stack_data/distros/gentoo.txt
@@ -1 +1 @@
-dev-python/stack_data
+dev-python/stack-data
diff --git a/build/pkgs/trove_classifiers/distros/alpine.txt b/build/pkgs/trove_classifiers/distros/alpine.txt
@@ -0,0 +1 @@
+py3-trove-classifiers
diff --git a/build/pkgs/trove_classifiers/distros/arch.txt b/build/pkgs/trove_classifiers/distros/arch.txt
@@ -0,0 +1 @@
+python-trove-classifiers
diff --git a/build/pkgs/trove_classifiers/distros/fedora.txt b/build/pkgs/trove_classifiers/distros/fedora.txt
@@ -0,0 +1 @@
+python-trove-classifiers
diff --git a/build/pkgs/trove_classifiers/distros/freebsd.txt b/build/pkgs/trove_classifiers/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-trove-classifiers
diff --git a/build/pkgs/trove_classifiers/distros/gentoo.txt b/build/pkgs/trove_classifiers/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/trove-classifiers
diff --git a/build/pkgs/trove_classifiers/distros/macports.txt b/build/pkgs/trove_classifiers/distros/macports.txt
@@ -0,0 +1 @@
+py-trove-classifiers
diff --git a/build/pkgs/trove_classifiers/spkg-configure.m4 b/build/pkgs/trove_classifiers/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([trove_classifiers], [
+  SAGE_PYTHON_PACKAGE_CHECK([trove_classifiers])
+])

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([appnope], [`
	`2`	`+ SAGE_PYTHON_PACKAGE_CHECK([appnope])`
	`3`	`+])`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+SAGE_SPKG_CONFIGURE([argon2_cffi_bindings], [`
	`2`	`+ SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi_bindings])`
	`3`	`+])`