diff options
| author | Andreas Baumbach <healther@users.noreply.github.com> | 2018-10-12 19:57:32 +0200 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2018-10-12 10:57:32 -0700 |
| commit | 028391c0a3778d20d162882b6778a164984ceb2a (patch) | |
| tree | 53d7be244aa4b211b74d1fe787dbfa5ca38bc03a /var | |
| parent | 6977d933c860dc0168428d8b8127af6fc3f59ffd (diff) | |
| download | spack-028391c0a3778d20d162882b6778a164984ceb2a.tar.gz spack-028391c0a3778d20d162882b6778a164984ceb2a.tar.bz2 spack-028391c0a3778d20d162882b6778a164984ceb2a.tar.xz spack-028391c0a3778d20d162882b6778a164984ceb2a.zip | |
py-spyder: update dependencies and fix build (#9207)
* Remove py-setuptools dependency from py-spyder (fixes #9205)
* Add constraint on transitive qt dependency to build with webkit
extension (required for this package)
* Update pycodestyle dependency constraints
* reordered dependencies (py-zmq, py-chardet) to confirm to the
ordering in setup.py
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-spyder/package.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index 6a3d8b3ccd..db7af50224 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -34,7 +34,7 @@ class PySpyder(PythonPackage): version('3.1.3', '4b9b7c8c3e6dc00001e6e98473473c36') version('2.3.9', 'dd01e07a77123c128ff79ba57b97c1d7') - depends_on('py-setuptools', type='build') + depends_on('python@2.7.0:2.8.0,3.3.0:', type=('build', 'run')) depends_on('py-rope@0.9.4:', type=('build', 'run'), when='^python@:3') # depends_on('py-rope_py3k', type=('build', 'run'), when='^python@3:') depends_on('py-jedi@0.9.0', type=('build', 'run')) @@ -44,12 +44,21 @@ class PySpyder(PythonPackage): depends_on('py-qtconsole@4.2.0:', type=('build', 'run')) depends_on('py-nbconvert', type=('build', 'run')) depends_on('py-sphinx', type=('build', 'run')) - depends_on('py-pycodestyle', type=('build', 'run')) + # The pycodestyle dependency is split in two, because internally it + # changes its name from pep8 to pycodestyle, and spyder does not cope + # with this change until @3.2.0 + # https://github.com/PyCQA/pycodestyle/issues/466 + # https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md#version-32-2017-07-24 + depends_on('py-pycodestyle@:1.7.1', when='@:3.1.99', type=('build', 'run')) + depends_on('py-pycodestyle@2.1.0:', when='@3.2.0:', type=('build', 'run')) depends_on('py-pylint', type=('build', 'run')) depends_on('py-psutil', type=('build', 'run')) depends_on('py-qtawesome@0.4.1:', type=('build', 'run')) depends_on('py-qtpy@1.1.0:', type=('build', 'run')) - depends_on('py-zmq', type=('build', 'run')) - depends_on('py-chardet@2:', type=('build', 'run')) + # technically this is a transitive dependency in order for py-pyqt + # to pick up webkit, but this is the easier solution (see #9207) + depends_on('qt+webkit', type=('build', 'run')) depends_on('py-pickleshare', type=('build', 'run')) + depends_on('py-zmq', type=('build', 'run')) + depends_on('py-chardet@2.0.0:', type=('build', 'run')) depends_on('py-numpydoc', type=('build', 'run')) |