From b98201593027850e23da6b65f9ba53474a4a2ed6 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 9 Jan 2020 16:33:10 +0100 Subject: root: Configure ROOT correctly for python3 (#14225) * Configure ROOT correctly for python3 * Record Python version conflict * Code editing on a phone sucks --- var/spack/repos/builtin/packages/root/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') 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'], -- cgit v1.2.3-60-g2f50