diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-10-04 11:31:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 03:31:46 -0600 |
| commit | 931fce2c24a79eec0ec20c388d949ee088a82e28 (patch) | |
| tree | a154b599fd3de6400df9b534111616b72b126352 | |
| parent | 42fbf17c821903de642bf0878e2acbab0e24abf4 (diff) | |
| download | spack-931fce2c24a79eec0ec20c388d949ee088a82e28.tar.gz spack-931fce2c24a79eec0ec20c388d949ee088a82e28.tar.bz2 spack-931fce2c24a79eec0ec20c388d949ee088a82e28.tar.xz spack-931fce2c24a79eec0ec20c388d949ee088a82e28.zip | |
py-isort: needs setuptools build dep before v5 (#40234)
* py-isort: needs setuptools build dep before v5
Detected in #40224.
In the past, system setuptools could be picked up when using an external
python, so py-isort@4 would install fine. With the linked PR, pip can
only consider packages that Spack controls from PYTHONPATH, so the issue
of missing py-setuptools showed up.
* py-importlib-metadata: fix lowerbounds on python
* review
* py-isort unconditionally add optional setuptools dep to prevent picking up user package at runtime
* style
* drop optional py-setuptools run dep
| -rw-r--r-- | var/spack/repos/builtin/packages/py-importlib-metadata/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-isort/package.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py index 910b287ac8..0abad1fe97 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -32,6 +32,9 @@ class PyImportlibMetadata(PythonPackage): version("0.19", sha256="23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8") version("0.18", sha256="cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db") + depends_on("python@3.8:", when="@6.8.0:", type=("build", "run")) + # lowerbound needed as spack itself supports python 3.6 (can be dropped in spack 0.21) + depends_on("python@3.7:", when="@4.9.0:", type=("build", "run")) depends_on("py-setuptools@56:", when="@4.6.4:", type="build") depends_on("py-setuptools", type="build") depends_on("py-setuptools-scm@3.4.1:+toml", when="@3:", type="build") diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index ce49a3e1bc..aca4dd2904 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -23,7 +23,8 @@ class PyIsort(PythonPackage): depends_on("python@3.8:", when="@5.12:", type=("build", "run")) depends_on("python@3.6.1:3", when="@5:5.10", type=("build", "run")) - depends_on("py-poetry-core@1:", type="build") + depends_on("py-setuptools", when="@:4", type=("build", "run")) + depends_on("py-poetry-core@1:", when="@5:", type="build") depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) depends_on("py-colorama@0.4.3:0.4", when="+colors @:5.11", type=("build", "run")) |