hub env: use req. file and add lower bounds for readability

This commit is contained in:
Erik Sundell
2023-05-18 23:42:53 +02:00
parent a86e4ce153
commit eaa16babb5
2 changed files with 33 additions and 16 deletions

View File

@@ -106,25 +106,13 @@ def ensure_jupyterhub_package(prefix):
hub environment be installed with pip prevents accidental mixing of python hub environment be installed with pip prevents accidental mixing of python
and conda packages! and conda packages!
""" """
# Install pycurl. JupyterHub prefers pycurl over SimpleHTTPClient automatically # Install dependencies for installing pycurl via pip, where build-essential
# pycurl is generally more bugfree - see https://github.com/jupyterhub/the-littlest-jupyterhub/issues/289 # is generally useful for installing other packages as well.
# build-essential is also generally useful to everyone involved, and required for pycurl
apt.install_packages(["libssl-dev", "libcurl4-openssl-dev", "build-essential"]) apt.install_packages(["libssl-dev", "libcurl4-openssl-dev", "build-essential"])
conda.ensure_pip_packages(prefix, ["pycurl==7.*"], upgrade=True)
conda.ensure_pip_packages( conda.ensure_pip_requirements(
prefix, prefix,
[ os.path.join(HERE, "requirements-hub-env.txt"),
"jupyterhub==4.*",
"jupyterhub-systemdspawner==0.17.*",
"jupyterhub-firstuseauthenticator==1.*",
"jupyterhub-nativeauthenticator==1.*",
"jupyterhub-ldapauthenticator==1.*",
"jupyterhub-tmpauthenticator==0.6.*",
"oauthenticator==15.*",
"jupyterhub-idle-culler==1.*",
"git+https://github.com/yuvipanda/jupyterhub-configurator@317759e17c8e48de1b1352b836dac2a230536dba",
],
upgrade=True, upgrade=True,
) )
traefik.ensure_traefik_binary(prefix) traefik.ensure_traefik_binary(prefix)

View File

@@ -0,0 +1,29 @@
# When tljh.installer runs, the hub' environment as typically found in
# /opt/tljh/hub, is upgraded to use these packages.
#
# When a new release is made, the lower bounds should be incremented to the
# latest release to help us narrow the versions based on knowing what tljh
# version is installed from inspecting this file.
#
# If a dependency is bumped to a new major version, we should make a major
# version release of tljh.
#
jupyterhub>=4.0.0,<5
jupyterhub-systemdspawner>=0.17.0,<5
jupyterhub-firstuseauthenticator>=1.0.0,<2
jupyterhub-nativeauthenticator>=1.1.0,<2
jupyterhub-ldapauthenticator>=1.3.2,<2
jupyterhub-tmpauthenticator>=0.6.0,<0.7
oauthenticator>=15.1.0,<16
jupyterhub-idle-culler>=1.2.1,<2
git+https://github.com/yuvipanda/jupyterhub-configurator@317759e17c8e48de1b1352b836dac2a230536dba
# pycurl is installed to improve reliability and performance for when JupyterHub
# makes web requests. JupyterHub will use tornado's CurlAsyncHTTPClient when
# making requests over tornado's SimpleHTTPClient automatically if pycurl is
# installed.
#
# ref: https://www.tornadoweb.org/en/stable/httpclient.html#module-tornado.simple_httpclient
# ref: https://github.com/jupyterhub/the-littlest-jupyterhub/issues/289
#
pycurl>=7.45.2,<8