Merge branch 'track/1.7' of github.com:canonical/notebook-operators i…

…nto track/1.7
canonical · Sep 13, 2023 · 2d25c66 · 2d25c66
2 parents 2dbbe2b + a07a87e
commit 2d25c66
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 153 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -47,6 +47,7 @@ jobs:
           provider: microk8s
           channel: 1.24/stable
           charmcraft-channel: latest/candidate
+          juju-channel: 2.9/stable
         # TODO: Unpin this when this bug is resolved: https://bugs.launchpad.net/juju/+bug/1992833.
         #       In particular, these tests failed deploying the prometheus-k8s charm where it gets an error in
         #       the "metrics-endpoint-relation-changed" hook.
@@ -78,6 +79,7 @@ jobs:
           provider: microk8s
           channel: 1.24/stable
           charmcraft-channel: latest/candidate
+          juju-channel: 2.9/stable
         # TODO: Unpin this when this bug is resolved: https://bugs.launchpad.net/juju/+bug/1992833.
         #       In particular, these tests failed deploying the prometheus-k8s charm where it gets an error in
         #       the "metrics-endpoint-relation-changed" hook.

diff --git a/charms/jupyter-controller/requirements-integration.in b/charms/jupyter-controller/requirements-integration.in
@@ -1,5 +1,9 @@
-juju<3.1
+httpx
+# Pinning to <3.0 to ensure compatibility with the 2.9 controller version
+juju<3.0
+lightkube
+pytest
 pytest-operator
+pyyaml
+requests
 tenacity
-websockets
--r requirements.txt
diff --git a/charms/jupyter-controller/requirements-integration.txt b/charms/jupyter-controller/requirements-integration.txt
@@ -2,8 +2,10 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile requirements-integration.in
+#    pip-compile ./requirements-integration.in
 #
+anyio==3.7.1
+    # via httpcore
 asttokens==2.2.1
     # via stack-data
 attrs==22.1.0
@@ -16,6 +18,8 @@ cachetools==5.2.0
     # via google-auth
 certifi==2022.12.7
     # via
+    #   httpcore
+    #   httpx
     #   kubernetes
     #   requests
 cffi==1.15.1
@@ -31,13 +35,26 @@ decorator==5.1.1
     #   ipdb
     #   ipython
 exceptiongroup==1.0.4
-    # via pytest
+    # via
+    #   anyio
+    #   pytest
 executing==1.2.0
     # via stack-data
 google-auth==2.15.0
     # via kubernetes
+h11==0.14.0
+    # via httpcore
+httpcore==0.17.3
+    # via httpx
+httpx==0.24.1
+    # via
+    #   -r ./requirements-integration.in
+    #   lightkube
 idna==3.4
-    # via requests
+    # via
+    #   anyio
+    #   httpx
+    #   requests
 iniconfig==1.1.1
     # via pytest
 ipdb==0.13.11
@@ -48,14 +65,18 @@ jedi==0.18.2
     # via ipython
 jinja2==3.1.2
     # via pytest-operator
-juju==3.0.4
+juju==2.9.44.0
     # via
-    #   -r requirements-integration.in
+    #   -r ./requirements-integration.in
     #   pytest-operator
 jujubundlelib==0.5.7
     # via theblues
 kubernetes==25.3.0
     # via juju
+lightkube==0.14.0
+    # via -r ./requirements-integration.in
+lightkube-models==1.27.1.4
+    # via lightkube
 macaroonbakery==1.3.1
     # via
     #   juju
@@ -68,10 +89,6 @@ mypy-extensions==0.4.3
     # via typing-inspect
 oauthlib==3.2.2
     # via requests-oauthlib
-oci-image==1.0.0
-    # via -r requirements.txt
-ops==1.5.4
-    # via -r requirements.txt
 packaging==22.0
     # via pytest
 paramiko==2.12.0
@@ -116,26 +133,28 @@ pyrfc3339==1.1
     #   macaroonbakery
 pytest==7.2.0
     # via
+    #   -r ./requirements-integration.in
     #   pytest-asyncio
     #   pytest-operator
 pytest-asyncio==0.20.3
     # via pytest-operator
 pytest-operator==0.22.0
-    # via -r requirements-integration.in
+    # via -r ./requirements-integration.in
 python-dateutil==2.8.2
     # via kubernetes
 pytz==2022.6
     # via pyrfc3339
 pyyaml==6.0
     # via
-    #   -r requirements.txt
+    #   -r ./requirements-integration.in
     #   juju
     #   jujubundlelib
     #   kubernetes
-    #   ops
+    #   lightkube
     #   pytest-operator
 requests==2.28.1
     # via
+    #   -r ./requirements-integration.in
     #   kubernetes
     #   macaroonbakery
     #   requests-oauthlib
@@ -146,16 +165,22 @@ rsa==4.9
     # via google-auth
 six==1.16.0
     # via
+    #   asttokens
     #   google-auth
     #   kubernetes
     #   macaroonbakery
     #   paramiko
     #   pymacaroons
     #   python-dateutil
+sniffio==1.3.0
+    # via
+    #   anyio
+    #   httpcore
+    #   httpx
 stack-data==0.6.2
     # via ipython
 tenacity==8.1.0
-    # via -r requirements-integration.in
+    # via -r ./requirements-integration.in
 theblues==0.5.2
     # via juju
 tomli==2.0.1
@@ -181,9 +206,7 @@ wcwidth==0.2.5
 websocket-client==1.4.2
     # via kubernetes
 websockets==7.0
-    # via
-    #   -r requirements-integration.in
-    #   juju
+    # via juju
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/charms/jupyter-controller/requirements.txt b/charms/jupyter-controller/requirements.txt
@@ -2,11 +2,13 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile ./requirements.in
 #
 oci-image==1.0.0
-    # via -r requirements.in
-ops==1.5.4
-    # via -r requirements.in
-pyyaml==6.0
+    # via -r ./requirements.in
+ops==2.4.1
+    # via -r ./requirements.in
+pyyaml==6.0.1
+    # via ops
+websocket-client==1.6.1
     # via ops
diff --git a/charms/jupyter-ui/requirements-integration.in b/charms/jupyter-ui/requirements-integration.in
@@ -1,7 +1,7 @@
 aiohttp
 jinja2
 juju<3.1
+lightkube
 pytest-operator
 requests
 tenacity
--r requirements.txt