From 5430d45db18f064741b86e6f61d0b03f17baf718 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 14 Mar 2017 09:44:46 -0500
Subject: Add latest version of openpyxl and missing dependencies (#3431)

---
 .../builtin/packages/py-et-xmlfile/package.py      | 36 ++++++++++++++++++++++
 .../repos/builtin/packages/py-jdcal/package.py     |  7 +++--
 .../repos/builtin/packages/py-openpyxl/package.py  | 14 ++++++---
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/py-et-xmlfile/package.py

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py
new file mode 100644
index 0000000000..eccb941701
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py
@@ -0,0 +1,36 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyEtXmlfile(PythonPackage):
+    """An implementation of lxml.xmlfile for the standard library."""
+
+    homepage = "https://bitbucket.org/openpyxl/et_xmlfile"
+    url      = "https://pypi.io/packages/source/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz"
+
+    version('1.0.1', 'f47940fd9d556375420b2e276476cfaf')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-jdcal/package.py b/var/spack/repos/builtin/packages/py-jdcal/package.py
index 964db1448f..5eb2e57d82 100644
--- a/var/spack/repos/builtin/packages/py-jdcal/package.py
+++ b/var/spack/repos/builtin/packages/py-jdcal/package.py
@@ -28,7 +28,10 @@ from spack import *
 class PyJdcal(PythonPackage):
     """Julian dates from proleptic Gregorian and Julian calendars"""
 
-    homepage = 'http://github.com/phn/jdcal'
-    url      = "https://pypi.python.org/packages/source/j/jdcal/jdcal-1.2.tar.gz"
+    homepage = "http://github.com/phn/jdcal"
+    url      = "https://pypi.io/packages/source/j/jdcal/jdcal-1.3.tar.gz"
 
+    version('1.3', '885ba61d28992f26acffec131bd2a17e')
     version('1.2', 'ab8d5ba300fd1eb01514f363d19b1eb9')
+
+    depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py
index d396916035..04d4a51f6d 100644
--- a/var/spack/repos/builtin/packages/py-openpyxl/package.py
+++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py
@@ -26,12 +26,16 @@ from spack import *
 
 
 class PyOpenpyxl(PythonPackage):
-    """A Python library to read/write Excel 2007 xlsx/xlsm files"""
+    """A Python library to read/write Excel 2010 xlsx/xlsm files"""
 
-    homepage = 'http://openpyxl.readthedocs.org/'
-    url      = "https://pypi.python.org/packages/source/o/openpyxl/openpyxl-2.4.0-a1.tar.gz"
+    homepage = "http://openpyxl.readthedocs.org/"
+    url      = "https://pypi.io/packages/source/o/openpyxl/openpyxl-2.4.5.tar.gz"
 
-    version('2.4.0-a1', 'e5ca6d23ceccb15115d45cdf26e736fc')
+    version('2.4.5', '3de13dc9b731e1a9dd61b873d9b35a8a')
+
+    depends_on('python@2.6:2.8,3.0:3.1,3.3:')
 
-    depends_on('py-jdcal', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
+
+    depends_on('py-jdcal',      type=('build', 'run'))
+    depends_on('py-et-xmlfile', type=('build', 'run'))
-- 
cgit v1.2.3-70-g09d2