Merge branch 'release/3.1.0'

jupyter-on-openshift · Jul 13, 2019 · e5c38dd · e5c38dd
2 parents ecd293a + f00c572
commit e5c38dd
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
@@ -2,6 +2,8 @@
 
 set -eo pipefail
 
+set -x
+
 # Ensure we are using the latest pip and wheel packages.
 
 pip install -U pip setuptools wheel

diff --git a/build-configs/jupyterhub.json b/build-configs/jupyterhub.json
@@ -39,7 +39,7 @@
                     "type": "Git",
                     "git": {
                         "uri": "https://github.com/jupyter-on-openshift/jupyterhub-quickstart.git",
-                        "ref": "3.0.7"
+                        "ref": "3.1.0"
                     }
                 },
                 "strategy": {
@@ -55,7 +55,7 @@
                 "output": {
                     "to": {
                         "kind": "ImageStreamTag",
-                        "name": "jupyterhub:3.0.7"
+                        "name": "jupyterhub:3.1.0"
                     }
                 }
             }

diff --git a/image-streams/jupyterhub.json b/image-streams/jupyterhub.json
@@ -14,10 +14,10 @@
                 },
                 "tags": [
                     {
-                        "name": "3.0.7",
+                        "name": "3.1.0",
                         "from": {
                             "kind": "DockerImage",
-                            "name": "quay.io/jupyteronopenshift/jupyterhub:3.0.7"
+                            "name": "quay.io/jupyteronopenshift/jupyterhub:3.1.0"
                         }
                     }
                 ]

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,10 @@
-jupyterhub==0.9.4
+kubernetes==9.0.0
+jupyterhub==0.9.6
 jupyterhub-kubespawner==0.10.1
 git+https://github.com/jupyterhub/wrapspawner.git@5f2b7075f77d0c1c49066682a8e8adad0dab76db
-jupyterhub-tmpauthenticator==0.5
-oauthenticator==0.8.0
+jupyterhub-tmpauthenticator==0.6
+oauthenticator==0.8.2
 jupyterhub-ldapauthenticator==1.2.2
-psycopg2==2.7.6.1
-openshift==0.8.6
-wrapt==1.10.11
+psycopg2==2.8.3
+openshift==0.9.0
+wrapt==1.11.2
diff --git a/templates/jupyterhub-builder.json b/templates/jupyterhub-builder.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "BUILDER_IMAGE",
-            "value": "jupyterhub:3.0.7",
+            "value": "jupyterhub:3.1.0",
             "required": true
         },
         {

diff --git a/templates/jupyterhub-deployer.json b/templates/jupyterhub-deployer.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "JUPYTERHUB_IMAGE",
-            "value": "jupyterhub:3.0.7",
+            "value": "jupyterhub:3.1.0",
             "required": true
         },
         {

diff --git a/templates/jupyterhub-quickstart.json b/templates/jupyterhub-quickstart.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "JUPYTERHUB_IMAGE",
-            "value": "jupyterhub:3.0.7",
+            "value": "jupyterhub:3.1.0",
             "required": true
         },
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     set -eo pipefail
+    set -x
     # Ensure we are using the latest pip and wheel packages.
     pip install -U pip setuptools wheel
@@ Expand Down @@