Skip to content

Commit

Permalink
sagemathgh-36332: Yet more more spkgs confs
Browse files Browse the repository at this point in the history
    
a continuation of sagemath#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: sagemath#36332
Reported by: Dima Pasechnik
Reviewer(s): Michael Orlitzky
  • Loading branch information
Release Manager committed Oct 18, 2023
2 parents 50683ff + 27e037f commit f89aaf1
Show file tree
Hide file tree
Showing 57 changed files with 120 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build/pkgs/appnope/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([appnope], [
SAGE_PYTHON_PACKAGE_CHECK([appnope])
])
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
security/py-argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-argon2-cffi-bindings
1 change: 1 addition & 0 deletions build/pkgs/argon2_cffi_bindings/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-argon2-cffi-bindings
3 changes: 3 additions & 0 deletions build/pkgs/argon2_cffi_bindings/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([argon2_cffi_bindings], [
SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi_bindings])
])
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-calver
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2022.6.26
1 change: 1 addition & 0 deletions build/pkgs/calver/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-calver
3 changes: 3 additions & 0 deletions build/pkgs/calver/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([calver], [
SAGE_PYTHON_PACKAGE_CHECK([calver])
])
48 changes: 48 additions & 0 deletions build/pkgs/cython/patches/5690.patch
Original file line number Diff line number Diff line change
@@ -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')
3 changes: 3 additions & 0 deletions build/pkgs/cython/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([cython], [
SAGE_PYTHON_PACKAGE_CHECK([cython])
])
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-fastjsonschema
1 change: 1 addition & 0 deletions build/pkgs/fastjsonschema/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-fastjsonschema
3 changes: 3 additions & 0 deletions build/pkgs/fastjsonschema/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([fastjsonschema], [
SAGE_PYTHON_PACKAGE_CHECK([fastjsonschema])
])
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-hatch-fancy-pypi-readme
1 change: 1 addition & 0 deletions build/pkgs/hatch_fancy_pypi_readme/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-fancy-pypi-readme
3 changes: 3 additions & 0 deletions build/pkgs/hatch_fancy_pypi_readme/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([hatch_fancy_pypi_readme], [
SAGE_PYTHON_PACKAGE_CHECK([hatch_fancy_pypi_readme])
])
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-hatch-vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-hatch_vcs
1 change: 1 addition & 0 deletions build/pkgs/hatch_vcs/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hatch-vcs
3 changes: 3 additions & 0 deletions build/pkgs/hatch_vcs/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([hatch_vcs], [
SAGE_PYTHON_PACKAGE_CHECK([hatch_vcs])
])
2 changes: 1 addition & 1 deletion build/pkgs/stack_data/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dev-python/stack_data
dev-python/stack-data
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py3-trove-classifiers
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-trove-classifiers
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-trove-classifiers
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
devel/py-trove-classifiers
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-python/trove-classifiers
1 change: 1 addition & 0 deletions build/pkgs/trove_classifiers/distros/macports.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
py-trove-classifiers
3 changes: 3 additions & 0 deletions build/pkgs/trove_classifiers/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SAGE_SPKG_CONFIGURE([trove_classifiers], [
SAGE_PYTHON_PACKAGE_CHECK([trove_classifiers])
])

0 comments on commit f89aaf1

Please sign in to comment.