summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsknigh <sknigh@sandia.gov>2017-09-22 10:06:15 -0700
committerscheibelp <scheibel1@llnl.gov>2017-09-22 10:06:15 -0700
commit7b4d8d6d1e13f2a44a0c86d90c6d756347ba7f55 (patch)
treeead87e108c027060d29bb4db6a923be4bd4d47a0
parent6ff57bde4264788e87ab9099f82d4e0e89b83c1e (diff)
downloadspack-7b4d8d6d1e13f2a44a0c86d90c6d756347ba7f55.tar.gz
spack-7b4d8d6d1e13f2a44a0c86d90c6d756347ba7f55.tar.bz2
spack-7b4d8d6d1e13f2a44a0c86d90c6d756347ba7f55.tar.xz
spack-7b4d8d6d1e13f2a44a0c86d90c6d756347ba7f55.zip
Version fixes for py-csvkit (#5393)
-rw-r--r--var/spack/repos/builtin/packages/py-csvkit/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-dateutil/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-dbf/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-openpyxl/package.py1
4 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py
index c0e42d514c..04409c9ff7 100644
--- a/var/spack/repos/builtin/packages/py-csvkit/package.py
+++ b/var/spack/repos/builtin/packages/py-csvkit/package.py
@@ -35,9 +35,10 @@ 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-dateutil@2.2', type=('build', 'run'), when='@0.9.1')
+ depends_on('py-dateutil', type=('build', 'run'), when='@0.9.2:')
+ depends_on('py-dbf@0.94.003', type=('build', 'run'))
depends_on('py-xlrd', type=('build', 'run'))
depends_on('py-sqlalchemy', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
- depends_on('py-openpyxl', type=('build', 'run'))
+ depends_on('py-openpyxl@2.2.0-b1', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py
index 91ed5129c6..f13ccaa7f5 100644
--- a/var/spack/repos/builtin/packages/py-dateutil/package.py
+++ b/var/spack/repos/builtin/packages/py-dateutil/package.py
@@ -30,6 +30,7 @@ class PyDateutil(PythonPackage):
homepage = "https://pypi.python.org/pypi/dateutil"
url = "https://pypi.io/packages/source/p/python-dateutil/python-dateutil-2.4.0.tar.gz"
+ version('2.2', 'c1f654d0ff7e33999380a8ba9783fd5c')
version('2.4.0', '75714163bb96bedd07685cdb2071b8bc')
version('2.4.2', '4ef68e1c485b09e9f034e10473e5add2')
version('2.5.2', 'eafe168e8f404bf384514f5116eedbb6')
diff --git a/var/spack/repos/builtin/packages/py-dbf/package.py b/var/spack/repos/builtin/packages/py-dbf/package.py
index ff3dc73e07..a40887345a 100644
--- a/var/spack/repos/builtin/packages/py-dbf/package.py
+++ b/var/spack/repos/builtin/packages/py-dbf/package.py
@@ -33,3 +33,4 @@ class PyDbf(PythonPackage):
url = "https://pypi.io/packages/source/d/dbf/dbf-0.96.005.tar.gz"
version('0.96.005', 'bce1a1ed8b454a30606e7e18dd2f8277')
+ version('0.94.003', '33a659ec90d7e8d8ffcd69d2189c0c6c')
diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py
index 278e41d57e..2a87f3739a 100644
--- a/var/spack/repos/builtin/packages/py-openpyxl/package.py
+++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py
@@ -32,6 +32,7 @@ class PyOpenpyxl(PythonPackage):
url = "https://pypi.io/packages/source/o/openpyxl/openpyxl-2.4.5.tar.gz"
version('2.4.5', '3de13dc9b731e1a9dd61b873d9b35a8a')
+ version('2.2.0-b1', 'eeefabe384f6e53166c8c2e6abe5d11b')
depends_on('python@2.6:2.8,3.0:3.1,3.3:')