Update deps after python 3.9 switch

Update all requirements files at once and fix manual update issues, plus the new conflicts that appeared after python 3.9 switch. Also change tox environment to match python 3.9 during unit tests. References: TPA-643
mlira59 · Jan 4, 2024 · a452cf3 · a452cf3
1 parent c9531eb
commit a452cf3
Show file tree

Hide file tree

Showing 9 changed files with 1,084 additions and 895 deletions.
diff --git a/requirements-ansible-2q.txt b/requirements-ansible-2q.txt
diff --git a/requirements-ansible-community.txt b/requirements-ansible-community.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/requirements/ansible.txt b/requirements/ansible.txt
diff --git a/requirements/dep.txt b/requirements/dep.txt
@@ -4,12 +4,7 @@
 #
 #    pip-compile --generate-hashes --output-file=requirements/dep.txt requirements/dep.in
 #
-pipdeptree==2.2.1 \
-    --hash=sha256:2b97d80c64d229e01ad242f14229a899263c6e8645c588ec5b054c1b81f3065d \
-    --hash=sha256:e20655a38d6e363d8e86d6a85e8a648680a3f4b6d039d6ee3ab0f539da1ad6ce
+pipdeptree==2.13.1 \
+    --hash=sha256:1e1acdb2ddc2abdca1718f27ca8dc21622c896a00b8980ec3d42c2208a841a10 \
+    --hash=sha256:760fa0d93f424637445a9e7ca797bf64f283e824cbeadc61f761e12b722bb004
     # via -r requirements/dep.in
-
-# WARNING: The following packages were not pinned, but pip requires them to be
-# pinned when the requirements file includes hashes and the requirement is not
-# satisfied by a package already installed. Consider using the --allow-unsafe flag.
-# pip
diff --git a/requirements/lint.txt b/requirements/lint.txt
diff --git a/requirements/testing.in b/requirements/testing.in
@@ -1,4 +1,5 @@
 # tox dependencies for test env
+certifi>=2023.7.22
 coverage>=4.0.1
 PyYAML>=6
 pytest==4.6.5; python_version <= '3.4'
@@ -8,3 +9,5 @@ pytest-html~=3.2.0
 requests_mock~=1.11.0
 pytest-mock~=3.6.1
 jq~=1.4.1
+# fix urllib3 under 1.27 to match botocore requirement (from boto3)
+urllib3<1.27
diff --git a/requirements/testing.txt b/requirements/testing.txt
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36-lint, py38-lint, py36-test, py38-test, dep
+envlist = py39-lint, py39-test, dep
 skipsdist = True
 skip_missing_interpreters = True