summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHadrien G <knights_of_ni@gmx.com>2020-01-09 16:33:10 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2020-01-09 09:33:10 -0600
commitb98201593027850e23da6b65f9ba53474a4a2ed6 (patch)
treedfc2a31887497916d1bdee484b3a418059e6d128 /var
parentff2367259147fc70a20f35ccbd4681e47812a2dc (diff)
downloadspack-b98201593027850e23da6b65f9ba53474a4a2ed6.tar.gz
spack-b98201593027850e23da6b65f9ba53474a4a2ed6.tar.bz2
spack-b98201593027850e23da6b65f9ba53474a4a2ed6.tar.xz
spack-b98201593027850e23da6b65f9ba53474a4a2ed6.zip
root: Configure ROOT correctly for python3 (#14225)
* Configure ROOT correctly for python3 * Record Python version conflict * Code editing on a phone sucks
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/root/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py
index 6d5641f2f3..4384e0e2b0 100644
--- a/var/spack/repos/builtin/packages/root/package.py
+++ b/var/spack/repos/builtin/packages/root/package.py
@@ -241,6 +241,9 @@ class Root(CMakePackage):
# GCC 9.2.1, which we can safely extrapolate to the GCC 9 series.
conflicts('%gcc@9.0.0:', when='@:6.11.99')
+ # ROOT <6.14 was incompatible with Python 3.7+
+ conflicts('python@3.7:', when='@:6.13.99 +python')
+
# See README.md
conflicts('+http',
msg='HTTP server currently unsupported due to dependency issues')
@@ -358,8 +361,7 @@ class Root(CMakePackage):
['pgsql', 'postgres'],
['pythia6'],
['pythia8', False],
- ['python', self.spec.satisfies('+python ^python@2.7:2.99.99')],
- ['python3', self.spec.satisfies('+python ^python@3.0:')],
+ ['python', self.spec.satisfies('+python')],
['qt', 'qt4'], # See conflicts
['qtgsi', 'qt4'], # See conflicts
['r', 'R'],