diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-cartopy/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-setuptools-scm/package.py | 20 |
2 files changed, 15 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index 589df6239c..bb06f758d9 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -14,6 +14,7 @@ class PyCartopy(PythonPackage): maintainers = ['adamjstewart'] + version('0.20.3', sha256='0d60fa2e2fbd77c4d1f6b1f9d3b588966147f07c1b179d2d34570ac1e1b49006') version('0.20.2', sha256='4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35') version('0.20.1', sha256='91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3') version('0.20.0', sha256='eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a') @@ -45,7 +46,8 @@ class PyCartopy(PythonPackage): depends_on('py-cython@0.29.2:', when='@0.19:', type='build') depends_on('py-cython@0.29.13:', when='@0.20:', type='build') depends_on('py-setuptools-scm', when='@0.19:', type='build') - depends_on('py-setuptools-scm-git-archive', when='@0.19:', type='build') + depends_on('py-setuptools-scm@7:', when='@0.20.3:', type='build') + depends_on('py-setuptools-scm-git-archive', when='@0.19:0.20.2', type='build') # requirements/default.txt depends_on('py-numpy@1.6:', type=('build', 'run')) 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 dc48d9c5db..757d22a7f1 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.0.3', sha256='cf8ab8e235bed840cd4559b658af0d8e8a70896a191bbc510ee914ec5325332d') version('6.3.2', sha256='a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2') version('6.0.1', sha256='d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92') version('5.0.2', sha256='83a0cedd3449e3946307811a4c7b9d89c4b5fd464a2fb5eeccd0a5bb158ae5c8') @@ -21,17 +22,20 @@ class PySetuptoolsScm(PythonPackage): version('3.1.0', sha256='1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40') version('1.15.6', sha256='49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f') + # Basically a no-op in setuptools_scm 7+, toml support is always built variant('toml', default=True, description='Build with TOML support') - depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) - depends_on('python@2.7:2.8,3.5:', when='@4:', type=('build', 'run')) + depends_on('python@3.7:', when='@7:', type=('build', 'run')) depends_on('python@3.6:', when='@6:', type=('build', 'run')) + depends_on('python@2.7:2.8,3.5:', when='@4:', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + depends_on('py-packaging@20.0:', when='@6.3:', type=('build', 'run')) + depends_on('py-setuptools@45:', when='@6:', type=('build', 'run')) + depends_on('py-setuptools@42:', when='@5:', type=('build', 'run')) depends_on('py-setuptools@34.4:', type=('build', 'run')) - depends_on('py-setuptools@42:', type=('build', 'run'), when='@5:') - depends_on('py-setuptools@45:', type=('build', 'run'), when='@6:') - depends_on('py-toml', when='+toml @:6.1.0', type=('build', 'run')) - depends_on('py-tomli@1.0.0:', when='+toml @6.1.0:', type=('build', 'run')) - - depends_on('py-packaging@20.0:', when='@6.3.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-typing-extensions', when='@7:', type=('build', 'run')) + depends_on('py-importlib-metadata', when='@7: ^python@:3.7', type=('build', 'run')) |