From d853e2db57865d51fc59ca252712a3433604f93d Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 19 Jan 2022 04:57:40 -0600 Subject: py-pyside2: fix various build issues (#28455) --- var/spack/repos/builtin/packages/py-pyside2/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyside2/package.py b/var/spack/repos/builtin/packages/py-pyside2/package.py index 56c00a6903..19de2d0e57 100644 --- a/var/spack/repos/builtin/packages/py-pyside2/package.py +++ b/var/spack/repos/builtin/packages/py-pyside2/package.py @@ -17,6 +17,7 @@ class PyPyside2(PythonPackage): # https://wiki.qt.io/Qt_for_Python_Development_Getting_Started version('develop', tag='dev') + version('5.15.2.1', tag='v5.15.2.1', submodules=True) version('5.14.2.1', tag='v5.14.2.1', submodules=True) version('5.13.2', tag='v5.13.2', submodules=True) version('5.13.1', tag='v5.13.1', submodules=True) @@ -26,12 +27,16 @@ class PyPyside2(PythonPackage): variant('doc', default=False, description='Enables the generation of html and man page documentation') depends_on('python@2.7.0:2.7,3.5.0:3.5,3.6.1:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.5.0:3.5,3.6.1:3.8', when='@:5.14', type=('build', 'run')) depends_on('cmake@3.1:', type='build') depends_on('llvm@6:', type='build') depends_on('py-setuptools', type='build') + depends_on('py-packaging', type='build') depends_on('py-wheel', type='build') - depends_on('qt@5.11:+opengl', type=('build', 'run')) + # https://bugreports.qt.io/browse/PYSIDE-1385 + depends_on('py-wheel@:0.34', when='@:5.14', type='build') + depends_on('qt@5.11:+opengl') depends_on('graphviz', when='+doc', type='build') depends_on('libxml2@2.6.32:', when='+doc', type='build') @@ -48,6 +53,10 @@ class PyPyside2(PythonPackage): args.append('--build-tests') return args + def install(self, spec, prefix): + python('setup.py', 'install', '--prefix=' + prefix, + *self.install_options(spec, prefix)) + @run_after('install') def install_docs(self): if '+doc' in self.spec: -- cgit v1.2.3-70-g09d2