diff options
| author | Ben Cowan <ben@bencowan.org> | 2023-07-06 11:54:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-06 13:54:29 -0400 |
| commit | 28b884ace540f6691979bcf256260ad37e3aee50 (patch) | |
| tree | d037e3240539f1e595722c43110a41cb74793d16 /var | |
| parent | a13687f022dfc411cb1005c29de66980e25e8b7b (diff) | |
| download | spack-28b884ace540f6691979bcf256260ad37e3aee50.tar.gz spack-28b884ace540f6691979bcf256260ad37e3aee50.tar.bz2 spack-28b884ace540f6691979bcf256260ad37e3aee50.tar.xz spack-28b884ace540f6691979bcf256260ad37e3aee50.zip | |
Add new version 5.0.0 of PyAMG (#38674)
* Added v5.0.0 of PyAMG. This required v7.1.0 of setuptools_scm due to a bug in 7.0.5.
* Added comment about version requirement.
* Loosened dependency based on build experiments.
* Updated tomli deps.
* Update var/spack/repos/builtin/packages/py-setuptools-scm/package.py
Dependence for 7.0 only.
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/py-pyamg/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Swapped lines.
---------
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyamg/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-setuptools-scm/package.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyamg/package.py b/var/spack/repos/builtin/packages/py-pyamg/package.py index 0adabf5621..0b6898d63d 100644 --- a/var/spack/repos/builtin/packages/py-pyamg/package.py +++ b/var/spack/repos/builtin/packages/py-pyamg/package.py @@ -16,6 +16,7 @@ class PyPyamg(PythonPackage): # A list of GitHub accounts to notify when the package is updated. maintainers("benc303") + version("5.0.0", sha256="088be4b38203e708905fa45295593c1336b127a28391486d4f5917cf0b96f5f2") version("4.2.3", sha256="dcf23808e0e8edf177fc4f71a6b36e0823ffb117137a33a9eee14b391ddbb733") version("4.1.0", sha256="9e340aef5da11280a1e28f28deeaac390f408e38ee0357d0fdbb77503747bbc4") version("4.0.0", sha256="015d5e706e6e54d3de82e05fdb173c30d8b27cb8a117ab584cd62ad41d9ea042") @@ -25,5 +26,8 @@ class PyPyamg(PythonPackage): depends_on("py-numpy@1.7:", type=("build", "run")) depends_on("py-scipy@0.12:", type=("build", "run")) depends_on("py-setuptools@42:", type="build", when="@4.2.0:") + # Later version required due to + # https://github.com/pypa/setuptools_scm/issues/758 + depends_on("py-setuptools-scm@7.1:+toml", type="build", when="@5.0.0:") depends_on("py-setuptools-scm@5:+toml", type="build", when="@4.2.0:") depends_on("py-pybind11@2.8.0:", type=("build"), when="@4.2.0:") diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index 8e0ca92621..807c0ced17 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -12,6 +12,7 @@ class PySetuptoolsScm(PythonPackage): homepage = "https://github.com/pypa/setuptools_scm" pypi = "setuptools_scm/setuptools_scm-4.1.2.tar.gz" + version("7.1.0", sha256="6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27") version("7.0.5", sha256="031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844") version("7.0.3", sha256="cf8ab8e235bed840cd4559b658af0d8e8a70896a191bbc510ee914ec5325332d") version("6.3.2", sha256="a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2") @@ -37,6 +38,7 @@ class PySetuptoolsScm(PythonPackage): depends_on("py-setuptools@34.4:", type=("build", "run")) depends_on("py-toml", when="+toml @:6.1.0", type=("build", "run")) depends_on("py-tomli@1:", when="+toml @6.1.0:", type=("build", "run")) - depends_on("py-tomli@1:", when="@7:", type=("build", "run")) + depends_on("py-tomli@1:", when="@7.0", type=("build", "run")) + depends_on("py-tomli@1:", when="@7.1: ^python@:3.10", type=("build", "run")) depends_on("py-typing-extensions", when="@7:", type=("build", "run")) depends_on("py-importlib-metadata", when="@7: ^python@:3.7", type=("build", "run")) |