Update URL for new py2neo versions (#15324)

* Update URL for new py2neo versions

* Use pypi for py-py2neo

* Add version 4.3.0

* Update py2neo dependencies

* Apply suggestions from code review

Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

3 files changed, 54 insertions, 6 deletions

diff --git a/var/spack/repos/builtin/packages/py-neobolt/package.py b/var/spack/repos/builtin/packages/py-neobolt/package.py
new file mode 100644
index 0000000000..7e19e529fd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-neobolt/package.py
@@ -0,0 +1,18 @@
+# Copyright 2013-2020 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 PyNeobolt(PythonPackage):
+    """Neo4j Bolt connector for Python"""
+
+    homepage = "https://github.com/neo4j-drivers/neobolt"
+    url      = "https://pypi.io/packages/source/n/neobolt/neobolt-1.7.16.tar.gz"
+
+    version('1.7.16', sha256='ca4e87679fe3ed39aec23638658e02dbdc6bbc3289a04e826f332e05ab32275d')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-neotime/package.py b/var/spack/repos/builtin/packages/py-neotime/package.py
new file mode 100644
index 0000000000..31769361c1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-neotime/package.py
@@ -0,0 +1,20 @@
+# Copyright 2013-2020 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 PyNeotime(PythonPackage):
+    """Nanosecond resolution temporal types"""
+
+    homepage = "https://neotime.readthedocs.io/"
+    url      = "https://pypi.io/packages/source/n/neotime/neotime-1.7.4.tar.gz"
+
+    version('1.7.4', sha256='4e0477ba0f24e004de2fa79a3236de2bd941f20de0b5db8d976c52a86d7363eb')
+
+    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
+    depends_on('py-setuptools',   type='build')
+    depends_on('py-pytz',         type=('build', 'run'))
+    depends_on('py-six',          type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py
index ef4ed46cd5..69e98d7b0b 100644
--- a/var/spack/repos/builtin/packages/py-py2neo/package.py
+++ b/var/spack/repos/builtin/packages/py-py2neo/package.py
@@ -11,12 +11,22 @@ class PyPy2neo(PythonPackage):
     within Python applications and from the command line."""
 
     homepage = "http://py2neo.org/"
-    url      = "https://github.com/nigelsmall/py2neo/archive/py2neo-2.0.8.tar.gz"
+    url      = "https://pypi.io/packages/source/p/py2neo/py2neo-2.0.8.tar.gz"
 
-    version('2.0.8', sha256='57b4a1c4aa800e03904b2adfd7c8ec467b072bae2d24baf150fd580916255f2e')
-    version('2.0.7', sha256='aa7c86fec70823111d2f932cb20a978889f1c47c2f58461309f644ecb9a22204')
-    version('2.0.6', sha256='bcf00ebc82a80c7e2da00288e8f90f81682abfc991e19d92d21726c2deac823f')
-    version('2.0.5', sha256='024b42261b06e5e2c92a1f24e62398847f090862005add0b5c69a79a7e1e87b5')
-    version('2.0.4', sha256='19074b7b892f2e989f39eae21fc59b26a05e1a820adad8aa58bc470b70d9056d')
+    version('4.3.0', sha256='a218ccb4b636e3850faa6b74ebad80f00600217172a57f745cf223d38a219222')
+    version('2.0.8', sha256='06167f5a91a0d9b9b73431baacd876f2d507650a681fdce1fcf3b383a9b991c1')
+    version('2.0.7', sha256='9b154053eb93c7f5fb3ebd48b6a5b99df450d3f2e9c6682153c6f8d59369378c')
+    version('2.0.6', sha256='6bb828d6d3e48b4d095b3f7d79dbb690a47633f0a9812eb62f141b042bab3186')
+    version('2.0.5', sha256='2c04d4223d2d356c4800c586f30c048757334f9391553c852c29aebf2368d101')
+    version('2.0.4', sha256='727726b87268ca1e929191b960a5473409e5bd81559ee83a304951104bb6b866')
 
     depends_on("py-setuptools", type='build')
+    depends_on("py-certifi", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-click@7.0", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-colorama", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-neobolt@1.7.12:1.7.999", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-neotime@1.7.4:1.7.999", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-prompt-toolkit@2.0.7:2.0.999", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-pygments@2.3.1:2.3.999", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-pytz", type=('build', 'run'), when='@4.3.0:')
+    depends_on("py-urllib3@1.23:1.24", type=('build', 'run'), when='@4.3.0:')