From 80807e6dd4f6f6a41693355fac969b66e3e32576 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Tue, 2 Nov 2021 03:04:43 +0100
Subject: Add missing dependency to py-setuptools-scm (#27132)
---
var/spack/repos/builtin/packages/py-importlib-metadata/package.py | 2 +-
var/spack/repos/builtin/packages/py-setuptools-scm/package.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py
index d0aaac7d20..961e2908f0 100644
--- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py
+++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py
@@ -13,7 +13,7 @@ class PyImportlibMetadata(PythonPackage):
pypi = "importlib_metadata/importlib_metadata-1.2.0.tar.gz"
version('4.8.1', sha256='f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1')
- version('4.6.1', sha256='079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac', preferred=True)
+ version('4.6.1', sha256='079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac')
version('3.10.1', sha256='c9356b657de65c53744046fa8f7358afe0714a1af7d570c00c3835c2d724a7c1')
version('3.10.0', sha256='c9db46394197244adf2f0b08ec5bc3cf16757e9590b02af1fca085c16c0d600a')
version('2.0.0', sha256='77a540690e24b0305878c37ffd421785a6f7e53c8b5720d211b211de8d0e95da')
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 52747a46fb..04723f5478 100644
--- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py
+++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py
@@ -13,7 +13,7 @@ class PySetuptoolsScm(PythonPackage):
pypi = "setuptools_scm/setuptools_scm-4.1.2.tar.gz"
version('6.3.2', sha256='a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2')
- version('6.0.1', sha256='d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92', preferred=True)
+ version('6.0.1', sha256='d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92')
version('4.1.2', sha256='a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8')
version('3.5.0', sha256='5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87')
version('3.3.3', sha256='bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5')
@@ -31,3 +31,5 @@ class PySetuptoolsScm(PythonPackage):
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'))
--
cgit v1.2.3-70-g09d2