diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2024-08-21 18:47:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 09:47:24 -0700 |
| commit | aa5b17ceb5bdbe4a41d6c0b5d5a8c96192c2dc16 (patch) | |
| tree | 89a6241002980bc8ddd0a827c2fedd42d6a42038 /var | |
| parent | eb5a1d3b4ca399a13ef998cd4b2ed61ac4074474 (diff) | |
| download | spack-aa5b17ceb5bdbe4a41d6c0b5d5a8c96192c2dc16.tar.gz spack-aa5b17ceb5bdbe4a41d6c0b5d5a8c96192c2dc16.tar.bz2 spack-aa5b17ceb5bdbe4a41d6c0b5d5a8c96192c2dc16.tar.xz spack-aa5b17ceb5bdbe4a41d6c0b5d5a8c96192c2dc16.zip | |
py-shapely: add v2.0.6 (#45833)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-shapely/package.py | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index f00f24170e..56b8ad26c4 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -21,6 +21,7 @@ class PyShapely(PythonPackage): license("BSD-3-Clause") version("main", branch="main") + version("2.0.6", sha256="997f6159b1484059ec239cacaa53467fd8b5564dabe186cd84ac2944663b0bf6") version("2.0.5", sha256="bff2366bc786bfa6cb353d6b47d0443c570c32776612e527ee47b6df63fcfe32") version("2.0.4", sha256="5dc736127fac70009b8d309a0eeb74f3e08979e530cf7017f2f507ef62e6cfb8") version("2.0.3", sha256="4d65d0aa7910af71efa72fd6447e02a8e5dd44da81a983de9d736d6e6ccbe674") @@ -35,22 +36,29 @@ class PyShapely(PythonPackage): version("1.8.0", sha256="f5307ee14ba4199f8bbcf6532ca33064661c1433960c432c84f0daa73b47ef9c") version("1.7.1", sha256="1641724c1055459a7e2b8bbe47ba25bdc89554582e62aec23cb3f3ca25f9b129") version("1.7.0", sha256="e21a9fe1a416463ff11ae037766fe410526c95700b9e545372475d2361cc951e") - version("1.6.4", sha256="b10bc4199cfefcf1c0e5d932eac89369550320ca4bdf40559328d85f1ca4f655") + version( + "1.6.4", + sha256="b10bc4199cfefcf1c0e5d932eac89369550320ca4bdf40559328d85f1ca4f655", + deprecated=True, + ) - depends_on("c", type="build") # generated + depends_on("c", type="build") # pyproject.toml - depends_on("py-cython", when="@2.0.2:", type="build") - depends_on("py-cython@0.29:0", when="@2.0.0:2.0.1", type="build") - depends_on("py-cython@0.29.24:2", when="@:1", type="build") - depends_on("py-setuptools@61:", when="@2:", type="build") - depends_on("py-setuptools@:63", when="@:1", type="build") - depends_on("py-numpy@1.14:2", when="@2.0.4:", type=("build", "link", "run")) - # https://github.com/shapely/shapely/issues/1972 - depends_on("py-numpy@1.14:1", when="@2.0.0:2.0.3", type=("build", "link", "run")) - depends_on("py-numpy@:1", when="@1", type=("build", "link", "run")) - depends_on("py-pytest", type="test") - depends_on("py-pytest-cov", type="test") + with default_args(type="build"): + depends_on("py-cython", when="@2.0.2:") + depends_on("py-cython@0.29:0", when="@2.0.0:2.0.1") + depends_on("py-cython@0.29.24:2", when="@:1") + depends_on("py-setuptools@61:", when="@2:") + depends_on("py-setuptools@:63", when="@:1") + + with default_args(type=("build", "link", "run")): + depends_on("py-numpy@1.14:2", when="@2.0.6:") + # https://github.com/shapely/shapely/issues/2098 + depends_on("py-numpy@1.14:2.0", when="@2.0.4:2.0.5") + # https://github.com/shapely/shapely/issues/1972 + depends_on("py-numpy@1.14:1", when="@2.0.0:2.0.3") + depends_on("py-numpy@:1", when="@1") # setup.py depends_on("geos@3.5:", when="@2:") @@ -71,7 +79,7 @@ class PyShapely(PythonPackage): letter = "S" return url.format(letter, version) - @when("^python@3.7:") + @when("@:1.8.1") def patch(self): # Python 3.7 changed the thread storage API, precompiled *.c files # need to be re-cythonized @@ -97,14 +105,3 @@ class PyShapely(PythonPackage): def setup_dependent_build_environment(self, env, dependent_spec): self.setup_build_environment(env) - - @run_after("install") - @on_package_attributes(run_tests=True) - def test_install(self): - """Run pytest tests""" - # https://shapely.readthedocs.io/en/latest/installation.html#testing-shapely - if self.version >= Version("2"): - with working_dir("spack-test", create=True): - python("-m", "pytest", "--pyargs", "shapely.tests") - else: - python("-m", "pytest") |