Fix setuptools handling in Python packages.

- add setuptools dependencies to packages that need it.
- remove setuptools from packages that do not need it.

12 files changed, 8 insertions, 5 deletions

diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py
index 8688e0ee7e..d8c262cfdd 100644
--- a/var/spack/repos/builtin/packages/py-astropy/package.py
+++ b/var/spack/repos/builtin/packages/py-astropy/package.py
@@ -37,6 +37,7 @@ class PyAstropy(PythonPackage):
     version('1.1.post1', 'b52919f657a37d45cc45f5cb0f58c44d')
 
     # Required dependencies
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
 
     # Optional dependencies
diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py
index a1215ce39e..c804076125 100644
--- a/var/spack/repos/builtin/packages/py-bottleneck/package.py
+++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py
@@ -32,4 +32,5 @@ class PyBottleneck(PythonPackage):
 
     version('1.0.0', '380fa6f275bd24f27e7cf0e0d752f5d2')
 
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py
index 5bcda9f449..5e18f5f8b2 100644
--- a/var/spack/repos/builtin/packages/py-csvkit/package.py
+++ b/var/spack/repos/builtin/packages/py-csvkit/package.py
@@ -34,6 +34,7 @@ class PyCsvkit(PythonPackage):
 
     version('0.9.1', '48d78920019d18846933ee969502fff6')
 
+    depends_on('py-setuptools', type='build')
     depends_on('py-dateutil', type=('build', 'run'))
     depends_on('py-dbf', type=('build', 'run'))
     depends_on('py-xlrd', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py
index 6419a9c40e..65fa67eb34 100644
--- a/var/spack/repos/builtin/packages/py-emcee/package.py
+++ b/var/spack/repos/builtin/packages/py-emcee/package.py
@@ -34,4 +34,5 @@ class PyEmcee(PythonPackage):
 
     version('2.1.0', 'c6b6fad05c824d40671d4a4fc58dfff7')
 
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-joblib/package.py b/var/spack/repos/builtin/packages/py-joblib/package.py
index 07306333f5..75ebae6804 100644
--- a/var/spack/repos/builtin/packages/py-joblib/package.py
+++ b/var/spack/repos/builtin/packages/py-joblib/package.py
@@ -35,6 +35,5 @@ class PyJoblib(PythonPackage):
     version('0.10.2', 'ebb42af4342c2445b175f86bd478d869')
     version('0.10.0', '61e40322c4fed5c22905f67d7d1aa557')
 
-    depends_on('py-setuptools', type='build')
     # for testing
     # depends_on('py-nose', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py
index af10f1c5d3..1c9be594ae 100644
--- a/var/spack/repos/builtin/packages/py-markdown/package.py
+++ b/var/spack/repos/builtin/packages/py-markdown/package.py
@@ -48,5 +48,4 @@ class PyMarkdown(PythonPackage):
     version('2.5.1', 'be6f6ba65a8fb843d2aaf1fcdd68c755')
     version('2.5', '8393ceab9c6e33357fb8a7be063a4849')
 
-    depends_on('py-setuptools', type='build')
     depends_on('python@2.7:2.8,3.2:3.4')
diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py
index 9ff1543018..ed1b97f1fe 100644
--- a/var/spack/repos/builtin/packages/py-periodictable/package.py
+++ b/var/spack/repos/builtin/packages/py-periodictable/package.py
@@ -34,5 +34,6 @@ class PyPeriodictable(PythonPackage):
 
     version('1.4.1', '7246b63cc0b6b1be6e86b6616f9e866e')
 
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-pyparsing', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py
index 27f219c64c..603799c446 100644
--- a/var/spack/repos/builtin/packages/py-pysocks/package.py
+++ b/var/spack/repos/builtin/packages/py-pysocks/package.py
@@ -33,5 +33,3 @@ class PyPysocks(PythonPackage):
 
     version('1.6.6', '571f4c23982fa86bf0e7a441f1b6c881')
     version('1.5.7', '68f4ad7a8d4fa725656ae3e9dd142d29')
-
-    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py
index 871016fdb1..87f65b842a 100644
--- a/var/spack/repos/builtin/packages/py-restview/package.py
+++ b/var/spack/repos/builtin/packages/py-restview/package.py
@@ -33,6 +33,7 @@ class PyRestview(PythonPackage):
 
     version('2.6.1', 'ac8b70e15b8f1732d1733d674813666b')
 
+    depends_on('py-setuptools', type='build')
     depends_on('python@2.7.0:2.7.999,3.3:3.5')
     depends_on('py-docutils@0.13.1:', type=('build', 'run'))
     depends_on('py-readme-renderer', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py
index f9d2546da3..998fb2ce1e 100644
--- a/var/spack/repos/builtin/packages/py-sncosmo/package.py
+++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py
@@ -37,6 +37,7 @@ class PySncosmo(PythonPackage):
     # Required dependencies
     # py-sncosmo binaries are duplicates of those from py-astropy
     extends('python', ignore=r'bin/.*')
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-scipy', type=('build', 'run'))
     depends_on('py-astropy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py
index 4cebe14fca..5dfd9b9068 100644
--- a/var/spack/repos/builtin/packages/py-terminado/package.py
+++ b/var/spack/repos/builtin/packages/py-terminado/package.py
@@ -33,6 +33,5 @@ class PyTerminado(PythonPackage):
 
     version('0.6', '5b6c65da27fe1ed07a9f80f0588cdaba')
 
-    depends_on('py-setuptools', type='build')
     depends_on('py-tornado@4:', type=('build', 'run'))
     depends_on('py-ptyprocess', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
index be1d151ee9..1973fda8ec 100644
--- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py
+++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
@@ -35,6 +35,7 @@ class PyWcsaxes(PythonPackage):
     version('0.8', 'de1c60fdae4c330bf5ddb9f1ab5ab920')
 
     extends('python', ignore=r'bin/')
+    depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-matplotlib', type=('build', 'run'))
     depends_on('py-astropy', type=('build', 'run'))