diff options
| author | iarspider <iarspider@gmail.com> | 2021-10-19 16:08:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 16:08:53 +0200 |
| commit | d6fc914a9bb535da3322404905194d289ff39370 (patch) | |
| tree | c310a186db4db7b9bf48588fe54b1bb047ce1cb2 | |
| parent | 79c92062a8626a27bfdfced67b3e917d9ff8ca72 (diff) | |
| download | spack-d6fc914a9bb535da3322404905194d289ff39370.tar.gz spack-d6fc914a9bb535da3322404905194d289ff39370.tar.bz2 spack-d6fc914a9bb535da3322404905194d289ff39370.tar.xz spack-d6fc914a9bb535da3322404905194d289ff39370.zip | |
Update py-importlib-metadata and py-setuptools-scm (#26813)
| -rw-r--r-- | var/spack/repos/builtin/packages/py-importlib-metadata/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-setuptools-scm/package.py | 4 |
2 files changed, 5 insertions, 1 deletions
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 5aefacec03..961e2908f0 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -12,6 +12,7 @@ class PyImportlibMetadata(PythonPackage): homepage = "https://importlib-metadata.readthedocs.io/" pypi = "importlib_metadata/importlib_metadata-1.2.0.tar.gz" + version('4.8.1', sha256='f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1') version('4.6.1', sha256='079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac') version('3.10.1', sha256='c9356b657de65c53744046fa8f7358afe0714a1af7d570c00c3835c2d724a7c1') version('3.10.0', sha256='c9db46394197244adf2f0b08ec5bc3cf16757e9590b02af1fca085c16c0d600a') @@ -24,6 +25,7 @@ class PyImportlibMetadata(PythonPackage): depends_on('python@3.6:', type=('build', 'run'), when='@3:') depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-setuptools@56:', type='build', when='@4.6.4:') depends_on('py-setuptools-scm', type='build') depends_on('py-setuptools-scm@3.4.1:+toml', type='build', when='@3:') depends_on('py-zipp@0.5:', 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 8997a44918..c56cda81a4 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('6.3.2', sha256='a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2') version('6.0.1', sha256='d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92') version('4.1.2', sha256='a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8') version('3.5.0', sha256='5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87') @@ -28,4 +29,5 @@ class PySetuptoolsScm(PythonPackage): depends_on('py-setuptools@34.4:', type=('build', 'run')) depends_on('py-setuptools@45:', type=('build', 'run'), when='@6:') - depends_on('py-toml', when='+toml', type=('build', 'run')) + 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')) |