diff options
| author | Gregory Lee <lee218@llnl.gov> | 2018-03-21 14:34:27 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-03-21 16:34:27 -0500 |
| commit | 7504e9997db3ce355ab0380f316ca7427b2a5c9a (patch) | |
| tree | 86565ac0d8426ca95014dc0a5577c1f57c8dd62e | |
| parent | 55f4bbb1116cadb7ee5c05d9932d4365b8f919c4 (diff) | |
| download | spack-7504e9997db3ce355ab0380f316ca7427b2a5c9a.tar.gz spack-7504e9997db3ce355ab0380f316ca7427b2a5c9a.tar.bz2 spack-7504e9997db3ce355ab0380f316ca7427b2a5c9a.tar.xz spack-7504e9997db3ce355ab0380f316ca7427b2a5c9a.zip | |
make py-setuptools a run-time-only dep for py-basemap and patch pytho… (#6989)
* make py-setuptools a run-time-only dep for py-basemap and patch python package to only apply setuptools flag for build deps
* py-qtconsole does not require setuptools
| -rw-r--r-- | lib/spack/spack/build_systems/python.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-basemap/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-qtconsole/package.py | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index fcfa68e4f4..837ebd65ae 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -237,9 +237,15 @@ class PythonPackage(PackageBase): # Spack manages the package directory on its own by symlinking # extensions into the site-packages directory, so we don't really # need the .pth files or egg directories, anyway. + # + # We need to make sure this is only for build dependencies. A package + # such as py-basemap will not build properly with this flag since + # it does not use setuptools to build and those does not recognize + # the --single-version-externally-managed flag if ('py-setuptools' == spec.name or # this is setuptools, or - 'py-setuptools' in spec._dependencies): # it's an immediate dep - args += ['--single-version-externally-managed', '--root=/'] + 'py-setuptools' in spec._dependencies and # it's an immediate dep + 'build' in spec._dependencies['py-setuptools'].deptypes): + args += ['--single-version-externally-managed', '--root=/'] return args diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 4e127f9626..624ffd6c3e 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -37,7 +37,7 @@ class PyBasemap(PythonPackage): # Per Github issue #3813, setuptools is required at runtime in order # to make mpl_toolkits a namespace package that can span multiple # directories (i.e., matplotlib and basemap) - depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools', type=('run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) depends_on('pil', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index 20306e07c4..2c19787cad 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -35,7 +35,6 @@ class PyQtconsole(PythonPackage): variant('doc', default=False, description='Build documentation') - depends_on('py-setuptools', type='build') depends_on('py-ipykernel@4.1:', type=('build', 'run')) depends_on('py-jupyter-client@4.1:', type=('build', 'run')) depends_on('py-jupyter-core', type=('build', 'run')) |