Revert "Fix Bug 2234 Upgrading Python libjuju to 2.9.42.1"

This reverts commit 3f1dfe6c3459ff3eaf6f87ac6ded1a8bcdd93a69.

Change-Id: Ife5237b2be30e1ddc4d91fb1c68c8a92e284be73
Signed-off-by: Guillermo Calvino <guillermo.calvino@canonical.com>

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 268bdd8..21f6ba6 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -15,18 +15,18 @@
 # limitations under the License.
 #######################################################################################
 aiokafka==0.7.2
-    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 dataclasses==0.6
-    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 kafka-python==2.0.2
     # via
-    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
     #   aiokafka
-osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v12.0
+osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master
     # via -r requirements-dev.in
 pycrypto==2.6.1
-    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 pymongo==3.12.3
-    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 pyyaml==5.4.1
-    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v12.0
+    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master

diff --git a/requirements-test.txt b/requirements-test.txt
index 8ebd644..87df1c9 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -16,31 +16,35 @@
 #######################################################################################
 asynctest==0.13.0
     # via -r requirements-test.in
-certifi==2022.12.7
+certifi==2022.6.15
     # via requests
-charset-normalizer==3.1.0
+charset-normalizer==2.0.12
     # via requests
-coverage==7.2.3
+coverage==6.4.1
+    # via
+    #   -r requirements-test.in
+    #   nose2
+flake8==4.0.1
     # via -r requirements-test.in
-flake8==6.0.0
-    # via -r requirements-test.in
-idna==3.4
+idna==3.3
     # via requests
-mccabe==0.7.0
+mccabe==0.6.1
     # via flake8
-mock==5.0.2
+mock==4.0.3
     # via -r requirements-test.in
-nose2==0.12.0
+nose2==0.11.0
     # via -r requirements-test.in
-pycodestyle==2.10.0
+pycodestyle==2.8.0
     # via flake8
-pyflakes==3.0.1
+pyflakes==2.4.0
     # via flake8
-requests==2.28.2
+requests==2.28.0
     # via requests-mock
-requests-mock==1.10.0
+requests-mock==1.9.3
     # via -r requirements-test.in
 six==1.16.0
-    # via requests-mock
-urllib3==1.26.15
+    # via
+    #   nose2
+    #   requests-mock
+urllib3==1.26.9
     # via requests

diff --git a/requirements.in b/requirements.in
index 3680b76..6c89871 100644 (file)
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,7 @@
 #     limitations under the License.
 
 async-timeout<4
-juju==2.9.42.1
+juju==2.9.10
 kubernetes
 motor==1.3.1
 pyasn1

diff --git a/requirements.txt b/requirements.txt
index aabaae8..32769ae 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,31 +18,32 @@ async-timeout==3.0.1
     # via
     #   -r requirements.in
     #   retrying-async
-bcrypt==4.0.1
+bcrypt==3.2.2
     # via paramiko
-cachetools==5.3.0
+cachetools==5.2.0
     # via google-auth
-certifi==2022.12.7
+certifi==2022.6.15
     # via
     #   kubernetes
     #   requests
-cffi==1.15.1
+cffi==1.15.0
     # via
+    #   bcrypt
     #   cryptography
     #   pynacl
-charset-normalizer==3.1.0
+charset-normalizer==2.0.12
     # via requests
-cryptography==40.0.2
+cryptography==37.0.2
     # via paramiko
-google-auth==2.17.3
+google-auth==2.8.0
     # via kubernetes
-idna==3.4
+idna==3.3
     # via requests
-juju==2.9.42.1
+juju==2.9.10
     # via -r requirements.in
 jujubundlelib==0.5.7
     # via theblues
-kubernetes==26.1.0
+kubernetes==24.2.0
     # via
     #   -r requirements.in
     #   juju
@@ -52,13 +53,13 @@ macaroonbakery==1.3.1
     #   theblues
 motor==1.3.1
     # via -r requirements.in
-mypy-extensions==1.0.0
+mypy-extensions==0.4.3
     # via typing-inspect
-oauthlib==3.2.2
+oauthlib==3.2.0
     # via requests-oauthlib
-paramiko==2.12.0
+paramiko==2.11.0
     # via juju
-protobuf==3.20.3
+protobuf==3.20.1
     # via macaroonbakery
 pyasn1==0.4.8
     # via
@@ -85,7 +86,7 @@ pyrfc3339==1.1
     #   macaroonbakery
 python-dateutil==2.8.2
     # via kubernetes
-pytz==2023.3
+pytz==2022.1
     # via pyrfc3339
 pyyaml==5.4.1
     # via
@@ -93,7 +94,7 @@ pyyaml==5.4.1
     #   juju
     #   jujubundlelib
     #   kubernetes
-requests==2.28.2
+requests==2.28.0
     # via
     #   kubernetes
     #   macaroonbakery
@@ -103,7 +104,7 @@ requests-oauthlib==1.3.1
     # via kubernetes
 retrying-async==2.0.0
     # via -r requirements.in
-rsa==4.9
+rsa==4.8
     # via google-auth
 six==1.16.0
     # via
@@ -115,17 +116,17 @@ six==1.16.0
     #   python-dateutil
 theblues==0.5.2
     # via juju
-toposort==1.10
+toposort==1.7
     # via juju
-typing-extensions==4.5.0
+typing-extensions==4.2.0
     # via typing-inspect
-typing-inspect==0.8.0
+typing-inspect==0.7.1
     # via juju
-urllib3==1.26.15
+urllib3==1.26.9
     # via
     #   kubernetes
     #   requests
-websocket-client==1.5.1
+websocket-client==1.3.3
     # via kubernetes
 websockets==7.0
     # via juju

diff --git a/tox.ini b/tox.ini
index 4b0144f..74e2aeb 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -65,9 +65,9 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dev.txt
         -r{toxinidir}/requirements-test.txt
-        pylint
+        pylint==2.10.2
 commands =
-    pylint -E n2vc --disable=E1101
+    pylint -E n2vc
 
 
 #######################################################################################
@@ -121,7 +121,7 @@ ignore =
         E125,
         E203,
         E226,
-        E241,
+        E241
 exclude =
         .git,
         __pycache__,