Upgrade dependencies to support Python 3.10 (Netflix#9325)

* Upgrade dependencies to support Python 3.10

* Upgrade dependencies to support Python 3.10

* Python 3.10 in Pre-commit

* Python 3.10 in Pre-commit try 2

.github/workflows/build-and-package.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10.5
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.10.5
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v1
       - name: Install dependencies
@@ -60,10 +60,10 @@ jobs:
       # master builds don't have tags, which breaks setupmeta versioning. This retrieves the tags.
       - run: git fetch --prune --unshallow --tags
         if: github.ref == 'refs/heads/master'
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10.5
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.10.5
       - name: Build UI assets
         run: |
           curl -sL https://deb.nodesource.com/setup_14.x | sudo bash

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-        language_version: python3.8
+        language_version: python3.10
 
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.7.0

Makefile

@@ -49,7 +49,7 @@ redis:
 
 .PHONY: test
 test: clean
-	ASYNC_TEST_TIMEOUT=60 $(pytest)
+	ASYNC_TEST_TIMEOUT=60 CONFIG_LOCATION=example_config/example_config_test.yaml $(pytest)
 
 .PHONY: bandit
 bandit: clean

consoleme/config/config.py

@@ -1,5 +1,5 @@
 """Configuration handling library."""
-import collections
+import collections.abc
 import datetime
 import logging
 import os
@@ -35,7 +35,7 @@ def dict_merge(dct: dict, merge_dct: dict):
         if (
             k in dct
             and isinstance(dct[k], dict)
-            and isinstance(merge_dct[k], collections.Mapping)
+            and isinstance(merge_dct[k], collections.abc.Mapping)
         ):
             dict_merge(dct[k], merge_dct[k])
         else:

requirements-docs.txt

@@ -1,55 +1,56 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements-docs.txt requirements-docs.in
 #
-click==8.0.3
+click==8.1.3
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   mkdocs
-ghp-import==2.0.1
+ghp-import==2.1.0
     # via mkdocs
-importlib-metadata==4.8.1
+importlib-metadata==4.12.0
     # via mkdocs
-jinja2==3.0.1
+jinja2==3.1.2
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   mkdocs
-markdown==3.3.4
+    #   mkdocs-material
+markdown==3.3.7
     # via
     #   mkdocs
     #   mkdocs-material
     #   pymdown-extensions
-markupsafe==2.0.1
+markupsafe==2.1.1
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   jinja2
 mergedeep==1.3.4
     # via mkdocs
-mkdocs-material-extensions==1.0.3
-    # via mkdocs-material
-mkdocs-material==7.2.6
-    # via -r requirements-docs.in
-mkdocs==1.2.3
+mkdocs==1.3.0
     # via
     #   -r requirements-docs.in
     #   mkdocs-material
-packaging==21.0
+mkdocs-material==8.3.9
+    # via -r requirements-docs.in
+mkdocs-material-extensions==1.0.3
+    # via mkdocs-material
+packaging==21.3
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   mkdocs
-pygments==2.10.0
+pygments==2.12.0
     # via
     #   -c requirements-test.txt
     #   mkdocs-material
-pymdown-extensions==8.2
+pymdown-extensions==9.5
     # via mkdocs-material
-pyparsing==2.4.7
+pyparsing==3.0.9
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
@@ -59,21 +60,21 @@ python-dateutil==2.8.2
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   ghp-import
-pyyaml-env-tag==0.1
-    # via mkdocs
-pyyaml==5.4.1
+pyyaml==6.0
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   -r requirements-docs.in
     #   mkdocs
     #   pyyaml-env-tag
+pyyaml-env-tag==0.1
+    # via mkdocs
 six==1.16.0
     # via
     #   -c requirements-test.txt
     #   -c requirements.txt
     #   python-dateutil
-watchdog==2.1.5
+watchdog==2.1.9
     # via mkdocs
-zipp==3.5.0
+zipp==3.8.1
     # via importlib-metadata