zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: drop nis module also for < 3.13 (#47862)

Browse Source 
the nis module was removed in python 3.13
we had it default to ~nis
no package requires +nis
required dependencies for +nis were missing

so better to remove the nis module entirely.
This commit is contained in:
Harmen Stoppels 2024-12-03 13:01:08 +01:00 committed by GitHub
parent b3ee954e5b
commit 6da9bf226a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
var/spack/repos/builtin/packages/python/package.py
View File

@ -22,7 +22,7 @@
from spack.util.prefix import Prefix
def make_pyvenv_cfg(python_spec: "spack.spec.Spec", venv_prefix: str) -> str:
def make_pyvenv_cfg(python_spec: Spec, venv_prefix: str) -> str:
"""Make a pyvenv_cfg file for a given (real) python command and venv prefix."""
python_cmd = python_spec.command.path
lines = [
@ -254,7 +254,6 @@ class Python(Package):
variant("ssl", default=True, description="Build ssl module")
variant("sqlite3", default=True, description="Build sqlite3 module")
variant("dbm", default=True, description="Build dbm module")
variant("nis", default=False, description="Build nis module")
variant("zlib", default=True, description="Build zlib module")
variant("bz2", default=True, description="Build bz2 module")
variant("lzma", default=True, description="Build lzma module")
@ -285,7 +284,6 @@ class Python(Package):
# https://docs.python.org/3.10/whatsnew/3.10.html#build-changes
depends_on("sqlite@3.7.15:", when="@3.10:+sqlite3")
depends_on("gdbm", when="+dbm") # alternatively ndbm or berkeley-db
depends_on("libnsl", when="+nis")
depends_on("zlib-api", when="+zlib")
depends_on("bzip2", when="+bz2")
depends_on("xz libs=shared", when="+lzma")
@ -387,7 +385,6 @@ def determine_variants(cls, exes, version_str):
"readline",
"sqlite3",
"dbm",
"nis",
"zlib",
"bz2",
"lzma",
@ -448,6 +445,29 @@ def patch(self):
r"^(.*)setup\.py(.*)((build)|(install))(.*)$", r"\1setup.py\2 --no-user-cfg \3\6"
)
# disable building the nis module (there is no flag to disable it).
if self.spec.satisfies("@3.8:3.10"):
filter_file(
"if MS_WINDOWS or CYGWIN or HOST_PLATFORM == 'qnx6':",
"if True:",
"setup.py",
string=True,
)
elif self.spec.satisfies("@3.7"):
filter_file(
"if host_platform in {'win32', 'cygwin', 'qnx6'}:",
"if True:",
"setup.py",
string=True,
)
elif self.spec.satisfies("@3.6"):
filter_file(
"if (host_platform not in ['cygwin', 'qnx6'] and",
"if False and",
"setup.py",
string=True,
)
def setup_build_environment(self, env):
spec = self.spec
@ -658,6 +678,11 @@ def configure_args(self):
]
)
# Disable the nis module in the configure script for Python 3.11 and 3.12. It is deleted
# in Python 3.13. See ``def patch`` for disabling the nis module in Python 3.10 and older.
if spec.satisfies("@3.11:3.12"):
config_args.append("py_cv_module_nis=n/a")
# https://docs.python.org/3.8/library/sqlite3.html#f1
if spec.satisfies("+sqlite3 ^sqlite+dynamic_extensions"):
config_args.append("--enable-loadable-sqlite-extensions")
@ -787,10 +812,6 @@ def import_tests(self):
if "+dbm" in spec:
self.command("-c", "import dbm")
# Ensure that nis module works
if "+nis" in spec:
self.command("-c", "import nis")
# Ensure that zlib module works
if "+zlib" in spec:
self.command("-c", "import zlib")