py-jupyterhub: add version: 1.4.1 (#24890)

* py-jupyterhub: add version: 1.4.1

* dont need mako for latest release

* sort dependencies

* notebook isnt used for 1.4.1+

* add dependency on py-jupyter-telemetry; create new package py-jupyter-telemetry

* py-jupyter-telemetry: declare missing dependencies

* py-jupyterhub: need more specific depends_on before less specific

* add py-json-logger; py-jupyter-telemetry: add depends_on for py-json-logger

* Update var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py

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

* remove py-json-logger erroneously and duplicatively added

* Update var/spack/repos/builtin/packages/py-jupyterhub/package.py

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

* need py-alembic@1.4: for newest py-jupyterhub

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

2 files changed, 42 insertions, 11 deletions

diff --git a/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py
new file mode 100644
index 0000000000..188bf5d09b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py
@@ -0,0 +1,23 @@
+# Copyright 2013-2021 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 PyJupyterTelemetry(PythonPackage):
+    """Jupyter Telemetry enables Jupyter Applications to record events and transmit"""
+    """ them to destinations as structured data"""
+
+    pypi = "jupyter-telemetry/jupyter_telemetry-0.1.0.tar.gz"
+
+    version('0.1.0', sha256='445c613ae3df70d255fe3de202f936bba8b77b4055c43207edf22468ac875314')
+    version('0.0.5', sha256='d3eaac14be17510a4d288f3737580107ce14eef543e6133d56654d3f0e742b9b')
+
+    depends_on('py-python-json-logger', type=('build', 'run'))
+    depends_on('py-jsonschema', type=('build', 'run'))
+    depends_on('py-ruamel-yaml', type=('build', 'run'))
+    depends_on('py-setuptools', type=('build'))
+    depends_on('py-traitlets', type=('build', 'run'))
+    depends_on('python@3.5:', 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 cfcfd295d9..2e07238ac6 100644
--- a/var/spack/repos/builtin/packages/py-jupyterhub/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterhub/package.py
@@ -11,24 +11,32 @@ class PyJupyterhub(PythonPackage):
 
     pypi = "jupyterhub/jupyterhub-1.0.0.tar.gz"
 
+    version('1.4.1',    sha256='ee1b0718a4db8e0b339796e3e50b704ca6822ab22a7435289dbb5932f65b5199')
     version('1.0.0',    sha256='33541a515a041b9a518ca057c1c4ab4215a7450fdddc206401713ee8137fa67f')
     version('0.9.4',    sha256='7848bbb299536641a59eb1977ec3c7c95d931bace4a2803d7e9b28b9256714da')
 
-    depends_on('python@3.5:', type=('build', 'run'))
-    depends_on('py-setuptools', type=('build', 'run'))
-    depends_on('py-python-dateutil', type=('build', 'run'))
-    depends_on('py-jinja2', type=('build', 'run'))
-    depends_on('py-sqlalchemy@1.1:', type=('build', 'run'))
-    depends_on('py-tornado@5.0:', type=('build', 'run'))
-    depends_on('py-traitlets@4.3.2:', type=('build', 'run'))
+    depends_on('py-alembic@1.4:', type=('build', 'run'), when='@1.4.1:')
     depends_on('py-alembic', type=('build', 'run'))
-    depends_on('py-mako', type=('build', 'run'))
+    depends_on('py-async-generator@1.9:', type=('build', 'run'), when='@1.4.1:')
     depends_on('py-async-generator@1.8:', type=('build', 'run'))
-    depends_on('py-requests', type=('build', 'run'))
     depends_on('py-certipy@0.1.2:', when='@1.0.0:',  type=('build', 'run'))
     depends_on('py-entrypoints', when='@1.0.0:',  type=('build', 'run'))
+    depends_on('py-jinja2@2.11.0:', type=('build', 'run'), when='@1.4.1:')
+    depends_on('py-jinja2', type=('build', 'run'))
+    depends_on('py-jupyter-telemetry@0.1.0:', type=('build', 'run'), when='@1.4.1:')
+    depends_on('py-mako', type=('build', 'run'), when='@:1.4.1')
+    depends_on('py-notebook', type=('build', 'run'), when='@:1.4.1')
     depends_on('py-oauthlib@3.0:', when='@1.0.0:', type=('build', 'run'))
-    depends_on('py-python-oauth2@1.0:', when='@:9.4', type=('build', 'run'))
     depends_on('py-pamela', type=('build', 'run'))
-    depends_on('py-notebook', type=('build', 'run'))
+    depends_on('py-prometheus-client@0.4.0:', type=('build', 'run'), when='@1.4.1:')
     depends_on('py-prometheus-client@0.0.21:', type=('build', 'run'))
+    depends_on('py-python-dateutil', type=('build', 'run'))
+    depends_on('py-python-oauth2@1.0:', when='@:0.9.4', type=('build', 'run'))
+    depends_on('py-requests', type=('build', 'run'))
+    depends_on('py-setuptools', type=('build', 'run'))
+    depends_on('py-sqlalchemy@1.1:', type=('build', 'run'))
+    depends_on('py-tornado@5.1:', type=('build', 'run'), when='@1.4.1:')
+    depends_on('py-tornado@5.0:', type=('build', 'run'))
+    depends_on('py-traitlets@4.3.2:', type=('build', 'run'))
+    depends_on('python@3.6:', type=('build', 'run'), when='@1.4.1:')
+    depends_on('python@3.5:', type=('build', 'run'))