diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pystac-client/package.py | 29 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pystac/package.py | 16 |
2 files changed, 35 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/py-pystac-client/package.py b/var/spack/repos/builtin/packages/py-pystac-client/package.py index 7d657fd221..7d3eb546c6 100644 --- a/var/spack/repos/builtin/packages/py-pystac-client/package.py +++ b/var/spack/repos/builtin/packages/py-pystac-client/package.py @@ -10,13 +10,30 @@ class PyPystacClient(PythonPackage): """Python library for working with Spatiotemporal Asset Catalog (STAC).""" homepage = "https://github.com/stac-utils/pystac-client.git" - pypi = "pystac-client/pystac-client-0.5.1.tar.gz" + pypi = "pystac-client/pystac_client-0.8.5.tar.gz" license("Apache-2.0") - version("0.5.1", sha256="f585bd9bcd52ee399c8a292dbb7e0405c0da359a73bc07c1ef82a65c17124d94") + version("0.8.5", sha256="7fba8d4f3c641ff7e840084fc3a53c96443a227f8a5889ae500fc38183ccd994") + version( + "0.5.1", + sha256="f585bd9bcd52ee399c8a292dbb7e0405c0da359a73bc07c1ef82a65c17124d94", + url="https://files.pythonhosted.org/packages/source/p/pystac-client/pystac-client-0.5.1.tar.gz", + deprecated=True, + ) - depends_on("py-setuptools", type="build") - depends_on("py-requests@2.27.1:", type=("build", "run")) - depends_on("py-pystac@1.4:", type=("build", "run")) - depends_on("py-python-dateutil@2.7:", type=("build", "run")) + with default_args(type="build"): + depends_on("py-setuptools@61:", when="@0.8:") + depends_on("py-setuptools") + + with default_args(type=("build", "run")): + depends_on("python@3.10:", when="@0.8:") + # setup.py imports 'imp', removed in Python 3.12 + depends_on("python@:3.11", when="@:0.6") + + depends_on("py-requests@2.28.2:", when="@0.8:") + depends_on("py-requests@2.27.1:") + depends_on("py-pystac@1.10:+validation", when="@0.8:") + depends_on("py-pystac@1.4:") + depends_on("py-python-dateutil@2.8.2:", when="@0.8:") + depends_on("py-python-dateutil@2.7:") diff --git a/var/spack/repos/builtin/packages/py-pystac/package.py b/var/spack/repos/builtin/packages/py-pystac/package.py index 6ddba4bca1..24994341ca 100644 --- a/var/spack/repos/builtin/packages/py-pystac/package.py +++ b/var/spack/repos/builtin/packages/py-pystac/package.py @@ -14,6 +14,7 @@ class PyPystac(PythonPackage): license("Apache-2.0") + version("1.11.0", sha256="acb1e04be398a0cda2d8870ab5e90457783a8014a206590233171d8b2ae0d9e7") version("1.4.0", sha256="6ec43e1c6bec50fbfbdede49c3ccb83ecd112072a938001b5c9c581fc2945e83") version("1.3.0", sha256="b0244641ef2a29a7b7929266b0d1eda2b0a0ef826dadb1aed93404a14e6e313b") version("1.2.0", sha256="8a60be2a30e1e28f8617a88f9f8fddc00c519be494a02ec111dc8fba62bf26e7") @@ -21,7 +22,14 @@ class PyPystac(PythonPackage): version("1.0.1", sha256="3927f2104cd2077638e046b9c258d5e6b442bfabf2d179cbefbf10f509efae85") version("0.5.4", sha256="9fc3359364685adf54e3bc78c87550a8bc8b0a927405419bd8e4bbd42a8efc79") - depends_on("python@3.7:", when="@1:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-python-dateutil@2.7:", type=("build", "run")) - depends_on("py-typing-extensions@3.7:", when="@1: ^python@:3.7", type=("build", "run")) + variant("validation", default=False, description="Install an additional jsonschema dependency") + + with default_args(type="build"): + depends_on("py-setuptools@61:", when="@1.11:") + depends_on("py-setuptools") + + with default_args(type=("build", "run")): + depends_on("python@3.10:", when="@1.11:") + depends_on("py-python-dateutil@2.7:") + + depends_on("py-jsonschema@4.18:4", when="+validation") |