From 989446e1ce078c623732061cdf37f0d9f3e79b8a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 19:09:21 -0600 Subject: [PATCH] fix: rm non-eic package versions now in upstream --- packages/py-argcomplete/package.py | 16 ---------- packages/py-jsonschema/package.py | 9 ------ packages/py-packaging/package.py | 9 ------ packages/py-python-swiftclient/package.py | 15 --------- packages/py-rich/package.py | 9 ------ packages/py-rpds-py/package.py | 20 ------------ packages/py-rucio-clients/package.py | 38 ----------------------- packages/py-urllib3/package.py | 13 -------- 8 files changed, 129 deletions(-) delete mode 100644 packages/py-argcomplete/package.py delete mode 100644 packages/py-jsonschema/package.py delete mode 100644 packages/py-packaging/package.py delete mode 100644 packages/py-python-swiftclient/package.py delete mode 100644 packages/py-rich/package.py delete mode 100644 packages/py-rpds-py/package.py delete mode 100644 packages/py-rucio-clients/package.py delete mode 100644 packages/py-urllib3/package.py diff --git a/packages/py-argcomplete/package.py b/packages/py-argcomplete/package.py deleted file mode 100644 index 4a329f8..0000000 --- a/packages/py-argcomplete/package.py +++ /dev/null @@ -1,16 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_argcomplete.package import PyArgcomplete as BuiltinPyArgcomplete -except: - from spack.pkg.builtin.py_argcomplete import PyArgcomplete as BuiltinPyArgcomplete - -class PyArgcomplete(BuiltinPyArgcomplete): - version("3.5.3", sha256="c12bf50eded8aebb298c7b7da7a5ff3ee24dffd9f5281867dfe1424b58c55392") - - depends_on("py-setuptools@67.7.2:", when="@3.1:3.5.2", type="build") - depends_on("py-setuptools", when="@:3.0", type="build") - depends_on("py-setuptools-scm+toml@6.2:", when="@3.1:3.5.2", type="build") - - depends_on("py-hatchling", when="@3.5.3:", type="build") - depends_on("py-hatch-vcs", when="@3.5.3:", type="build") diff --git a/packages/py-jsonschema/package.py b/packages/py-jsonschema/package.py deleted file mode 100644 index 18819b5..0000000 --- a/packages/py-jsonschema/package.py +++ /dev/null @@ -1,9 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_jsonschema.package import PyJsonschema as BuiltinPyJsonschema -except: - from spack.pkg.builtin.py_jsonschema import PyJsonschema as BuiltinPyJsonschema - -class PyJsonschema(BuiltinPyJsonschema): - version("4.23.0", sha256="d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4") diff --git a/packages/py-packaging/package.py b/packages/py-packaging/package.py deleted file mode 100644 index 901811b..0000000 --- a/packages/py-packaging/package.py +++ /dev/null @@ -1,9 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_packaging.package import PyPackaging as BuiltinPyPackaging -except: - from spack.pkg.builtin.py_packaging import PyPackaging as BuiltinPyPackaging - -class PyPackaging(BuiltinPyPackaging): - version("24.2", sha256="c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f") diff --git a/packages/py-python-swiftclient/package.py b/packages/py-python-swiftclient/package.py deleted file mode 100644 index e5ebe58..0000000 --- a/packages/py-python-swiftclient/package.py +++ /dev/null @@ -1,15 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_python_swiftclient.package import PyPythonSwiftclient as BuiltinPyPythonSwiftclient -except: - from spack.pkg.builtin.py_python_swiftclient import PyPythonSwiftclient as BuiltinPyPythonSwiftclient - -class PyPythonSwiftclient(BuiltinPyPythonSwiftclient): - def url_for_version(self, version): - if version < Version('4.7.0'): - return f"https://files.pythonhosted.org/packages/source/p/python-swiftclient/python-swiftclient-{version}.tar.gz" - else: - return f"https://files.pythonhosted.org/packages/source/p/python-swiftclient/python_swiftclient-{version}.tar.gz" - - version("4.7.0", sha256="afd7575753d8e49617adcb11550187fd0b120fcd819f1e782c0b538f2d093773") diff --git a/packages/py-rich/package.py b/packages/py-rich/package.py deleted file mode 100644 index a86d709..0000000 --- a/packages/py-rich/package.py +++ /dev/null @@ -1,9 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_rich.package import PyRich as BuiltinPyRich -except: - from spack.pkg.builtin.py_rich import PyRich as BuiltinPyRich - -class PyRich(BuiltinPyRich): - version("13.9.4", sha256="439594978a49a09530cff7ebc4b5c7103ef57baf48d5ea3184f21d9a2befa098") diff --git a/packages/py-rpds-py/package.py b/packages/py-rpds-py/package.py deleted file mode 100644 index e267b1b..0000000 --- a/packages/py-rpds-py/package.py +++ /dev/null @@ -1,20 +0,0 @@ -from spack.package import * -from spack.spec import Spec - -try: - from spack_repo.builtin.packages.py_rpds_py.package import PyRpdsPy as BuiltinPyRpdsPy -except ImportError: - from spack.pkg.builtin.py_rpds_py import PyRpdsPy as BuiltinPyRpdsPy - -class PyRpdsPy(BuiltinPyRpdsPy): - depends_on("rust@1.76:", type="build", when="@0.19:") - - def __init__(self, spec): - super(PyRpdsPy, self).__init__(spec) - # HACK Remove rust as a runtime dependency - for _spec in ["@0.19:"]: - if Spec(_spec) in PyRpdsPy.dependencies: - del PyRpdsPy.dependencies[Spec(_spec)] - -# instantiate at least once -_pyrpdspy = PyRpdsPy(Spec("py-rpds-py")) diff --git a/packages/py-rucio-clients/package.py b/packages/py-rucio-clients/package.py deleted file mode 100644 index d24971a..0000000 --- a/packages/py-rucio-clients/package.py +++ /dev/null @@ -1,38 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_rucio_clients.package import PyRucioClients as BuiltinPyRucioClients -except: - from spack.pkg.builtin.py_rucio_clients import PyRucioClients as BuiltinPyRucioClients - -class PyRucioClients(BuiltinPyRucioClients): - version( - "37.3.0", sha256="b4bca8d451bc34528797ca188884a0c8b5ddfef2d32803765e6333455879f819" - ) - - depends_on("py-requests@2.32.2:", type=("build", "run"), when="@:36") - depends_on("py-urllib3@1.26.18:", type=("build", "run"), when="@:36") - depends_on("py-requests@2.32.3:", type=("build", "run"), when="@37:") - depends_on("py-urllib3@2.3.0:", type=("build", "run"), when="@37:") - depends_on("py-jsonschema@4.20.0:", type=("build", "run"), when="@:36") - depends_on("py-jsonschema@4.23.0:", type=("build", "run"), when="@37:") - depends_on("py-packaging@24.2:", type=("build", "run"), when="@37:") - depends_on("py-rich@13.9.4:", type=("build", "run"), when="@37:") - depends_on("py-typing-extensions@4.12.2:", type=("build", "run")) - depends_on("py-click@8.1.7:", type=("build", "run"), when="@37:") - - with when("+ssh"): - depends_on("py-paramiko@3.4.0:", when="@:36") - depends_on("py-paramiko@3.5.1:", when="@37:") - - with when("+kerberos"): - depends_on("py-requests-kerberos@0.14.0:", when="@:36") - depends_on("py-requests-kerberos@0.15.0:", when="@37:") - - with when("+swift"): - depends_on("py-python-swiftclient@4.4.0:", when="@:36") - depends_on("py-python-swiftclient@4.7.0:", when="@37:") - - with when("+argcomplete"): - depends_on("py-argcomplete@3.1.6:", when="@:36") - depends_on("py-argcomplete@3.5.3:", when="@37:") diff --git a/packages/py-urllib3/package.py b/packages/py-urllib3/package.py deleted file mode 100644 index 0eb3bc7..0000000 --- a/packages/py-urllib3/package.py +++ /dev/null @@ -1,13 +0,0 @@ -from spack.package import * - -try: - from spack_repo.builtin.packages.py_urllib3.package import PyUrllib3 as BuiltinPyUrllib3 -except: - from spack.pkg.builtin.py_urllib3 import PyUrllib3 as BuiltinPyUrllib3 - -class PyUrllib3(BuiltinPyUrllib3): - version("2.3.0", sha256="f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d") - - depends_on("python@3.8:", when="@2.1.0:2.2", type=("build", "run")) - depends_on("python@3.9:", when="@2.3:", type=("build", "run")) - depends_on("py-hatch-vcs@0.4.0", when="@2.3:", type="build")