Rename py-dateutil -> py-python-dateutil (#11717)

12 files changed, 54 insertions, 38 deletions

diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py
index 06fece1d82..3f0c6e611d 100644
--- a/var/spack/repos/builtin/packages/ont-albacore/package.py
+++ b/var/spack/repos/builtin/packages/ont-albacore/package.py
@@ -25,7 +25,7 @@ class OntAlbacore(Package):
     depends_on('python@3.5.0:3.5.999', type=('build', 'run'))
     depends_on('py-setuptools',        type=('build', 'run'))
     depends_on('py-numpy@1.13.0',      type=('build', 'run'))
-    depends_on('py-dateutil',          type=('build', 'run'))
+    depends_on('py-python-dateutil',   type=('build', 'run'))
     depends_on('py-h5py',              type=('build', 'run'))
     depends_on('py-ont-fast5-api',     type=('build', 'run'))
     depends_on('py-pip',               type=('build'))
diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py
index 6e44b37361..9ce72eff36 100644
--- a/var/spack/repos/builtin/packages/py-bokeh/package.py
+++ b/var/spack/repos/builtin/packages/py-bokeh/package.py
@@ -18,7 +18,7 @@ class PyBokeh(PythonPackage):
     depends_on('py-six@1.5.2:',       type=('build', 'run'))
     depends_on('py-requests@1.2.3:',  type=('build', 'run'))
     depends_on('py-pyyaml@3.10:',     type=('build', 'run'))
-    depends_on('py-dateutil@2.1:',    type=('build', 'run'))
+    depends_on('py-python-dateutil@2.1:', type=('build', 'run'))
     depends_on('py-jinja2@2.7:',      type=('build', 'run'))
     depends_on('py-numpy@1.7.1:',     type=('build', 'run'))
     depends_on('py-tornado@4.3:',     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 98fe202434..c1941a8e4f 100644
--- a/var/spack/repos/builtin/packages/py-csvkit/package.py
+++ b/var/spack/repos/builtin/packages/py-csvkit/package.py
@@ -16,8 +16,8 @@ class PyCsvkit(PythonPackage):
     version('0.9.1', '48d78920019d18846933ee969502fff6')
 
     depends_on('py-setuptools', type='build')
-    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-python-dateutil@2.2', type=('build', 'run'), when='@0.9.1')
+    depends_on('py-python-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'))
diff --git a/var/spack/repos/builtin/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py
deleted file mode 100644
index 52ec1df92e..0000000000
--- a/var/spack/repos/builtin/packages/py-dateutil/package.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack import *
-
-
-class PyDateutil(PythonPackage):
-    """Extensions to the standard Python datetime module."""
-    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.7.5', sha256='88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02')
-    version('2.5.2', 'eafe168e8f404bf384514f5116eedbb6')
-    version('2.4.2', '4ef68e1c485b09e9f034e10473e5add2')
-    version('2.4.0', '75714163bb96bedd07685cdb2071b8bc')
-    version('2.2',   'c1f654d0ff7e33999380a8ba9783fd5c')
-
-    depends_on('py-setuptools', type='build')
-    depends_on('py-setuptools-scm', type='build', when='@2.7.5:')
-    depends_on('py-six', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-jupyterhub/package.py b/var/spack/repos/builtin/packages/py-jupyterhub/package.py
index 2178574be1..cfde53c23d 100644
--- a/var/spack/repos/builtin/packages/py-jupyterhub/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterhub/package.py
@@ -17,7 +17,7 @@ class PyJupyterhub(PythonPackage):
     depends_on('python@3.5:')
     depends_on('node-js', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
-    depends_on('py-dateutil', type='run')
+    depends_on('py-python-dateutil', type='run')
     depends_on('py-jinja2', type='run')
     depends_on('py-sqlalchemy', type='run')
     depends_on('py-tornado', type='run')
diff --git a/var/spack/repos/builtin/packages/py-luigi/package.py b/var/spack/repos/builtin/packages/py-luigi/package.py
index a831b8027e..5c90a9a87c 100644
--- a/var/spack/repos/builtin/packages/py-luigi/package.py
+++ b/var/spack/repos/builtin/packages/py-luigi/package.py
@@ -18,6 +18,6 @@ class PyLuigi(PythonPackage):
     depends_on('py-setuptools', type='build')
     depends_on('py-tornado@4.0:4.99', type=('build', 'run'))
     depends_on('py-python-daemon@:2.1', type=('build', 'run'))
-    depends_on('py-dateutil@2.7.5', when='@2.8.3:', type=('build', 'run'))
+    depends_on('py-python-dateutil@2.7.5', when='@2.8.3:', type=('build', 'run'))
 
     depends_on('py-test@3.3.0:', type='test')
diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py
index 265a8681ac..0020f06fab 100644
--- a/var/spack/repos/builtin/packages/py-matplotlib/package.py
+++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py
@@ -56,7 +56,7 @@ class PyMatplotlib(PythonPackage):
     patch('freetype-include-path.patch', when='@2.2.2:2.9.9')  # Patch to pick up correct freetype headers
 
     depends_on('py-numpy@1.6:', type=('build', 'run'))
-    depends_on('py-dateutil@1.1:', type=('build', 'run'))
+    depends_on('py-python-dateutil@1.1:', type=('build', 'run'))
     depends_on('py-pyparsing', type=('build', 'run'))
     depends_on('py-pytz', type=('build', 'run'))
     depends_on('py-cycler@0.9:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py
index 81aa07f035..07cdf90ee8 100644
--- a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py
+++ b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py
@@ -19,5 +19,5 @@ class PyOpenpmdValidator(PythonPackage):
 
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy@1.6.1:', type=('build', 'run'))
-    depends_on('py-dateutil@2.3.0:', type=('build', 'run'))
+    depends_on('py-python-dateutil@2.3.0:', type=('build', 'run'))
     depends_on('py-h5py@2.0.0:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py
index f6dde6da00..09a3993719 100644
--- a/var/spack/repos/builtin/packages/py-owslib/package.py
+++ b/var/spack/repos/builtin/packages/py-owslib/package.py
@@ -17,7 +17,7 @@ class PyOwslib(PythonPackage):
     version('0.16.0', '7ff9c9edde95eadeb27ea8d8fbd1a2cf')
 
     depends_on('py-setuptools',     type='build')
-    depends_on('py-dateutil@1.5:',  type=('build', 'run'))
+    depends_on('py-python-dateutil@1.5:',  type=('build', 'run'))
     depends_on('py-pytz',           type=('build', 'run'))
     depends_on('py-requests@1.0:',  type=('build', 'run'))
     depends_on('py-pyproj',           type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py
index 5fe1295c6f..1753ec115d 100644
--- a/var/spack/repos/builtin/packages/py-pandas/package.py
+++ b/var/spack/repos/builtin/packages/py-pandas/package.py
@@ -29,7 +29,7 @@ class PyPandas(PythonPackage):
     version('0.16.1', 'fac4f25748f9610a3e00e765474bdea8')
     version('0.16.0', 'bfe311f05dc0c351f8955fbd1e296e73')
 
-    depends_on('py-dateutil', type=('build', 'run'))
+    depends_on('py-python-dateutil', type=('build', 'run'))
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
     depends_on('py-cython', type='build')
diff --git a/var/spack/repos/builtin/packages/py-pydv/package.py b/var/spack/repos/builtin/packages/py-pydv/package.py
index 0a56ad95a3..53042bec02 100644
--- a/var/spack/repos/builtin/packages/py-pydv/package.py
+++ b/var/spack/repos/builtin/packages/py-pydv/package.py
@@ -15,9 +15,9 @@ class PyPydv(PythonPackage):
 
     version('2.4.2', 'fff9560177387a258f765c2d900bb241')
 
-    depends_on('py-backports-functools-lru-cache')
-    depends_on('py-cycler')
-    depends_on('py-dateutil')
-    depends_on('py-matplotlib')
-    depends_on('py-pyside')
-    depends_on('py-scipy')
+    depends_on('py-backports-functools-lru-cache', type=('build', 'run'))
+    depends_on('py-cycler', type=('build', 'run'))
+    depends_on('py-python-dateutil', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('py-pyside', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-python-dateutil/package.py b/var/spack/repos/builtin/packages/py-python-dateutil/package.py
new file mode 100644
index 0000000000..1abed8d85a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-python-dateutil/package.py
@@ -0,0 +1,38 @@
+# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PyPythonDateutil(PythonPackage):
+    """Extensions to the standard Python datetime module."""
+
+    homepage = "https://dateutil.readthedocs.io/"
+    url      = "https://pypi.io/packages/source/p/python-dateutil/python-dateutil-2.8.0.tar.gz"
+
+    import_modules = [
+        'dateutil', 'dateutil.zoneinfo', 'dateutil.parser', 'dateutil.tz'
+    ]
+
+    version('2.8.0', sha256='c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e')
+    version('2.7.5', sha256='88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02')
+    version('2.5.2', 'eafe168e8f404bf384514f5116eedbb6')
+    version('2.4.2', '4ef68e1c485b09e9f034e10473e5add2')
+    version('2.4.0', '75714163bb96bedd07685cdb2071b8bc')
+    version('2.2',   'c1f654d0ff7e33999380a8ba9783fd5c')
+
+    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
+    depends_on('py-setuptools@24.3:', type='build')
+    depends_on('py-six@1.5:', type=('build', 'run'))
+    # depends_on('py-pytest', type='test')
+    # depends_on('py-hypothesis', type='test')
+    # depends_on('py-freezegun', type='test')
+
+    def test(self):
+        # Tests require freezegun, which depends on python-dateutil,
+        # creating circular dependency
+        # pytest = which('pytest')
+        # pytest()
+        pass