diff options
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/py-hepdata-lib/package.py | 10 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-hepdata-validator/package.py | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py index 774595419c..1c082e9613 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py @@ -10,15 +10,19 @@ class PyHepdataLib(PythonPackage): """Library for getting your data into HEPData""" homepage = "https://github.com/HEPData/hepdata_lib" - pypi = "hepdata_lib/hepdata_lib-0.9.0.tar.gz" + # PyPI archives are broken: missing requirement.txt file + # pypi = "hepdata_lib/hepdata_lib-0.9.0.tar.gz" + url = "https://github.com/HEPData/hepdata_lib/archive/refs/tags/v0.9.0.tar.gz" - version("0.9.0", sha256="b7b194b8af0428f34094ac403f8794a672c82d85e33154161d6b3744cc2b9896") + version("0.10.1", sha256="71c635963883c51e7be18e03d80bfe42c5de350852b01010e3e45cbd1bff7a81") + version("0.9.0", sha256="c9238e45c603d7c061ed670cf197ff03ad9d370ab50419b6916fda2cd86d6150") depends_on("py-setuptools", type="build") depends_on("root+python", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) - depends_on("py-pyyaml@4:", type=("build", "run")) + depends_on("py-pyyaml@5:", type=("build", "run")) depends_on("py-future", type=("build", "run")) depends_on("py-six", type=("build", "run")) depends_on("py-pytest-runner", type="build") depends_on("py-pytest-cov", type="build") + depends_on("py-hepdata-validator@0.3.2:", when="@0.10.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py index cb3acc30bf..c14a45639f 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py @@ -14,6 +14,7 @@ class PyHepdataValidator(PythonPackage): tags = ["hep"] + version("0.3.3", sha256="dccdf2ba58bac78e879145a2ff31d299e7b20bd7f28b575ab9d07b950ab723ae") version("0.3.0", sha256="d603ddf908ce3838bac09bf7334184db4b35f03e2b215572c67b5e1fabbf0d9b") version("0.2.3", sha256="314e75eae7d4a134bfc8291440259839d82aabefdd720f237c0bf8ea5c9be4dc") version("0.1.16", sha256="3d7f725328ecdbb66826bff2e48a40a1d9234249859c8092ca0e92be7fb78111") @@ -21,7 +22,11 @@ class PyHepdataValidator(PythonPackage): version("0.1.14", sha256="d1596741fb26be234c2adb6972306908f09b049dc670d8312cf2636f1a615a52") version("0.1.8", sha256="08686563e0130c5dd6d9fb8d5c7bf5a2617a637b105a42f7106b96a31eaffa61") + depends_on("python@3.6:", when="@0.3.3:", type=("build", "run")) depends_on("py-setuptools", type="build") + depends_on("py-click", when="@0.3.3:", type=("build", "run")) depends_on("py-jsonschema", type=("build", "run")) + depends_on("py-packaging", when="@0.3.3:", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-pyyaml@5.4.1:", when="@0.3.3:", type=("build", "run")) depends_on("py-requests", type=("build", "run")) |