summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-11-17 11:25:33 +0100
committerGitHub <noreply@github.com>2021-11-17 11:25:33 +0100
commitac8993ac38839c7b0a73805c237f522ea4bd6407 (patch)
tree50e0bb95c92fd79a0835ce0e9236303ba0d896cb /var
parentcc62689504e8f8b24b41b77cba90dab142150353 (diff)
downloadspack-ac8993ac38839c7b0a73805c237f522ea4bd6407.tar.gz
spack-ac8993ac38839c7b0a73805c237f522ea4bd6407.tar.bz2
spack-ac8993ac38839c7b0a73805c237f522ea4bd6407.tar.xz
spack-ac8993ac38839c7b0a73805c237f522ea4bd6407.zip
New version of Spack and new conflicts (#27384)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/spack/package.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/spack/package.py b/var/spack/repos/builtin/packages/spack/package.py
index 9149b7ea65..fa7e858d67 100644
--- a/var/spack/repos/builtin/packages/spack/package.py
+++ b/var/spack/repos/builtin/packages/spack/package.py
@@ -21,6 +21,7 @@ class Spack(Package):
maintainers = ['haampie']
version('develop', branch='develop')
+ version('0.17.0', sha256='93df99256a892ceefb153d48e2080c01d18e58e27773da2c2a469063d67cb582')
version('0.16.3', sha256='26636a2e2cc066184f12651ac6949f978fc041990dba73934960a4c9c1ea383d')
version('0.16.2', sha256='ed3e5d479732b0ba82489435b4e0f9088571604e789f7ab9bc5ce89030793350')
version('0.16.1', sha256='8d893036b24d9ee0feee41ac33dd66e4fc68d392918f346f8a7a36a69c567567')
@@ -68,11 +69,15 @@ class Spack(Package):
# See https://github.com/spack/spack/pull/24686
# and #25595, #25726, #25853, #25923, #25924 upstream in python/cpython
with when('@:0.16.2'):
- conflicts('python@3.10:')
- conflicts('python@3.9.6:3.9')
- conflicts('python@3.8.11:3.8')
- conflicts('python@3.7.11:3.7')
- conflicts('python@3.6.14:3.6')
+ conflicts('^python@3.10:')
+ conflicts('^python@3.9.6:3.9')
+ conflicts('^python@3.8.11:3.8')
+ conflicts('^python@3.7.11:3.7')
+ conflicts('^python@3.6.14:3.6')
+
+ # https://bugs.python.org/issue45235#msg406121
+ # To be fixed in 3.9.9, no other releases are affected
+ conflicts('^python@3.9.8', when='@:0.17.0')
# Development tools
with when('+development_tools'):