version bumps

ci/e2e.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 shopt -s inherit_errexit
 
 apt-get update
-apt-get install -y python3.7-dev python3.7-venv
+apt-get install -y python3.10-dev python3-venv
 
 src/dev set-up-ci-environment
 src/dev e2e

ci/pipeline.yml

@@ -31,7 +31,7 @@ jobs:
           type: docker-image
           source:
             repository: python
-            tag: "3.8"
+            tag: "3.10"
         run:
           path: src/ci/test.sh
 

dev-requirements.txt

@@ -1,159 +1,169 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    ./dev update-requirements
+#    pip-compile --output-file=dev-requirements.txt pip-tools/dev-requirements.in
 #
-attrs==20.3.0
+async-timeout==4.0.2
+    # via
+    #   -r pip-tools/../requirements.txt
+    #   redis
+attrs==21.4.0
     # via pytest
-bandit==1.7.0
+bandit==1.7.4
     # via -r pip-tools/dev-requirements.in
-cachelib==0.1.1
+cachelib==0.7.0
     # via
     #   -r pip-tools/../requirements.txt
     #   flask-session
-certifi==2020.12.5
+certifi==2022.5.18
     # via
     #   -r pip-tools/../requirements.txt
     #   requests
-chardet==4.0.0
+charset-normalizer==2.0.12
     # via
     #   -r pip-tools/../requirements.txt
     #   requests
-click==7.1.2
+click==8.1.3
     # via
     #   -r pip-tools/../requirements.txt
     #   flask
     #   pip-tools
 colorama==0.4.4
     # via pytest-watch
+deprecated==1.2.13
+    # via
+    #   -r pip-tools/../requirements.txt
+    #   redis
 docopt==0.6.2
     # via pytest-watch
-environs==9.3.1
-    # via -r pip-tools/../requirements.txt
-flask-session==0.3.2
+environs==9.5.0
     # via -r pip-tools/../requirements.txt
-flask==1.1.2
+flask==2.1.2
     # via
     #   -r pip-tools/../requirements.txt
     #   flask-session
-gitdb==4.0.7
+flask-session==0.4.0
+    # via -r pip-tools/../requirements.txt
+gitdb==4.0.9
     # via gitpython
-gitpython==3.1.14
+gitpython==3.1.27
     # via bandit
-greenlet==1.0.0
+greenlet==1.1.2
     # via playwright
-gunicorn==20.0.4
+gunicorn==20.1.0
     # via -r pip-tools/../requirements.txt
-idna==2.10
+idna==3.3
     # via
     #   -r pip-tools/../requirements.txt
     #   requests
-importlib-metadata==3.7.3
-    # via
-    #   pep517
-    #   pluggy
-    #   pytest
-    #   stevedore
 iniconfig==1.1.1
     # via pytest
-itsdangerous==1.1.0
+itsdangerous==2.1.2
     # via
     #   -r pip-tools/../requirements.txt
     #   flask
-jinja2==2.11.3
+jinja2==3.1.2
     # via
     #   -r pip-tools/../requirements.txt
     #   flask
-markupsafe==1.1.1
+markupsafe==2.1.1
     # via
     #   -r pip-tools/../requirements.txt
     #   jinja2
-marshmallow==3.10.0
+marshmallow==3.15.0
     # via
     #   -r pip-tools/../requirements.txt
     #   environs
-packaging==20.9
-    # via pytest
-pbr==5.5.1
+packaging==21.3
+    # via
+    #   -r pip-tools/../requirements.txt
+    #   marshmallow
+    #   pytest
+    #   redis
+pbr==5.9.0
     # via stevedore
-pep517==0.10.0
+pep517==0.12.0
     # via pip-tools
-pip-tools==6.0.1
+pip-tools==6.6.1
     # via -r pip-tools/dev-requirements.in
-playwright==1.10.0
+playwright==1.22.0
     # via
     #   -r pip-tools/dev-requirements.in
     #   pytest-playwright
-pluggy==0.13.1
+pluggy==1.0.0
     # via pytest
-py==1.10.0
+py==1.11.0
     # via pytest
 pyee==8.1.0
     # via playwright
-pyjwt==2.0.1
+pyjwt==2.4.0
     # via -r pip-tools/../requirements.txt
 pyotp==2.6.0
     # via -r pip-tools/dev-requirements.in
-pyparsing==2.4.7
-    # via packaging
-pytest-base-url==1.4.2
-    # via pytest-playwright
-pytest-playwright==0.0.12
-    # via -r pip-tools/dev-requirements.in
-pytest-watch==4.2.0
-    # via -r pip-tools/dev-requirements.in
-pytest==6.2.2
+pyparsing==3.0.9
+    # via
+    #   -r pip-tools/../requirements.txt
+    #   packaging
+pytest==7.1.2
     # via
     #   -r pip-tools/dev-requirements.in
     #   pytest-base-url
     #   pytest-playwright
     #   pytest-watch
-python-dotenv==0.15.0
+pytest-base-url==2.0.0
+    # via pytest-playwright
+pytest-playwright==0.3.0
+    # via -r pip-tools/dev-requirements.in
+pytest-watch==4.2.0
+    # via -r pip-tools/dev-requirements.in
+python-dotenv==0.20.0
     # via
     #   -r pip-tools/../requirements.txt
     #   environs
-pyyaml==5.4.1
+python-slugify==6.1.2
+    # via pytest-playwright
+pyyaml==6.0
     # via bandit
-redis==3.5.3
+redis==4.3.1
     # via -r pip-tools/../requirements.txt
-requests-mock==1.8.0
-    # via -r pip-tools/dev-requirements.in
-requests==2.25.1
+requests==2.27.1
     # via
     #   -r pip-tools/../requirements.txt
     #   pytest-base-url
     #   requests-mock
-six==1.15.0
-    # via
-    #   bandit
-    #   requests-mock
-smmap==4.0.0
+requests-mock==1.9.3
+    # via -r pip-tools/dev-requirements.in
+six==1.16.0
+    # via requests-mock
+smmap==5.0.0
     # via gitdb
-stevedore==3.3.0
+stevedore==3.5.0
     # via bandit
-toml==0.10.2
+text-unidecode==1.3
+    # via python-slugify
+tomli==2.0.1
     # via
     #   pep517
     #   pytest
-typing-extensions==3.7.4.3
-    # via
-    #   importlib-metadata
-    #   playwright
-urllib3==1.26.4
+urllib3==1.26.9
     # via
     #   -r pip-tools/../requirements.txt
     #   requests
-watchdog==2.0.2
+watchdog==2.1.8
     # via pytest-watch
-werkzeug==1.0.1
+websockets==10.1
+    # via playwright
+werkzeug==2.1.2
     # via
     #   -r pip-tools/../requirements.txt
     #   flask
-zipp==3.4.1
+wheel==0.37.1
+    # via pip-tools
+wrapt==1.14.1
     # via
-    #   importlib-metadata
-    #   pep517
+    #   -r pip-tools/../requirements.txt
+    #   deprecated
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

e2e/test_setup.py

@@ -17,11 +17,11 @@ def test_login_redirects_home_without_slash(page, user_1):
 
 
 def test_login_redirects_home(page, user_1):
-    # this tests the basic case - going to logs.example.com/ 
+    # this tests the basic case - going to logs.example.com/
     log_in(user_1, page)
     assert page.url.startswith(f"{KIBANA_URL}app/home")
 
 
 def test_login_remembers_target(page, user_1):
-    log_in(user_1, page, f'{KIBANA_URL}app/dev_tools')
+    log_in(user_1, page, f"{KIBANA_URL}app/dev_tools")
     assert page.url.startswith(f"{KIBANA_URL}app/dev_tools")

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 88
-target-version = ['py36', 'py37', 'py38']
+target-version = ['py39', 'py310']
 include = '\.pyi?$'
 exclude = '''
 /(

requirements.txt

@@ -1,49 +1,61 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    ./dev update-requirements
+#    pip-compile --output-file=requirements.txt pip-tools/requirements.in
 #
-cachelib==0.1.1
+async-timeout==4.0.2
+    # via redis
+cachelib==0.7.0
     # via flask-session
-certifi==2020.12.5
+certifi==2022.5.18
     # via requests
-chardet==4.0.0
+charset-normalizer==2.0.12
     # via requests
-click==7.1.2
+click==8.1.3
     # via flask
-environs==9.3.1
+deprecated==1.2.13
+    # via redis
+environs==9.5.0
     # via -r pip-tools/requirements.in
-flask-session==0.3.2
-    # via -r pip-tools/requirements.in
-flask==1.1.2
+flask==2.1.2
     # via
     #   -r pip-tools/requirements.in
     #   flask-session
-gunicorn==20.0.4
+flask-session==0.4.0
+    # via -r pip-tools/requirements.in
+gunicorn==20.1.0
     # via -r pip-tools/requirements.in
-idna==2.10
+idna==3.3
     # via requests
-itsdangerous==1.1.0
+itsdangerous==2.1.2
     # via flask
-jinja2==2.11.3
+jinja2==3.1.2
     # via flask
-markupsafe==1.1.1
+markupsafe==2.1.1
     # via jinja2
-marshmallow==3.10.0
+marshmallow==3.15.0
     # via environs
-pyjwt==2.0.1
+packaging==21.3
+    # via
+    #   marshmallow
+    #   redis
+pyjwt==2.4.0
     # via -r pip-tools/requirements.in
-python-dotenv==0.15.0
+pyparsing==3.0.9
+    # via packaging
+python-dotenv==0.20.0
     # via environs
-redis==3.5.3
+redis==4.3.1
     # via -r pip-tools/requirements.in
-requests==2.25.1
+requests==2.27.1
     # via -r pip-tools/requirements.in
-urllib3==1.26.4
+urllib3==1.26.9
     # via requests
-werkzeug==1.0.1
+werkzeug==2.1.2
     # via flask
+wrapt==1.14.1
+    # via deprecated
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

tests/unit/test_app.py

@@ -71,7 +71,7 @@ def test_session_refreshes(client):
     on every request, with the updated session timeout, so we don't need to refresh
     the session. Since this is different from all the session documentation on Flask,
     it seems very possible the library will change in the future to match the default
-    behavior more closely, so this test will tell us we need to do something when that 
+    behavior more closely, so this test will tell us we need to do something when that
     happens.
     """
     client.get("/ping")