Merge remote-tracking branch 'origin/master' into dependabot/pip/requirements/pylint-2.12.2

adamtheturtle · adamtheturtle · commit 023f7504eb8c · 2021-12-11T21:06:57.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
         ci_pattern:
           - test_query.py::TestContentType
           - test_query.py::TestSuccess
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
         platform: [windows-latest]
 
     runs-on: ${{ matrix.platform }}
@@ -59,7 +59,7 @@ jobs:
         env:
           SKIP_REAL: 1
         run: |
-          pytest -s -vvv --exitfirst --cov=src/ --cov=tests --cov-report=xml tests/mock_vws/${{ matrix.ci_pattern }}
+          pytest -s -vvv --exitfirst --cov=src/ --cov=tests --cov-report=xml tests/mock_vws/
 
       - name: "Show coverage file"
         run: |
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -47,11 +47,16 @@
 # The name of the syntax highlighting style to use.
 pygments_style = 'sphinx'
 
+python_minumum_supported_version = '3.9'
+
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'VWSPYTHONMOCKdoc'
 autoclass_content = 'init'
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.9', None),
+    'python': (
+        f'https://docs.python.org/{python_minumum_supported_version}',
+        None,
+    ),
     'docker': ('https://docker-py.readthedocs.io/en/stable', None),
 }
 nitpicky = True
@@ -85,6 +90,7 @@
 autodoc_member_order = 'bysource'
 
 rst_prolog = f"""
+.. |python-minumum-version| replace:: {python_minumum_supported_version}
 .. |project| replace:: {project}
 .. |release| replace:: {release}
 .. |github-owner| replace:: VWS-Python
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -8,7 +8,7 @@ Mocking calls made to Vuforia with Python ``requests``
 
    pip3 install vws-python-mock
 
-This requires Python 3.9+.
+This requires Python |python-minumum-version|\+.
 
 .. include:: basic-example.rst
 
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -5,4 +5,4 @@ Installation
 
    pip3 install vws-python-mock
 
-This requires Python 3.9+.
+This requires Python |python-minumum-version|\+.
diff --git a/docs/source/release-process.rst b/docs/source/release-process.rst
@@ -10,7 +10,7 @@ Outcomes
 Prerequisites
 ~~~~~~~~~~~~~
 
-* ``python3`` on your ``PATH`` set to Python 3.9+.
+* ``python3`` on your ``PATH`` set to Python |python-minumum-version|\+.
 * ``virtualenv``.
 * Push access to this repository.
 * Trust that ``master`` is ready and high enough quality for release.
diff --git a/lint.mk b/lint.mk
@@ -42,7 +42,7 @@ fix-isort:
 
 .PHONY: pip-extra-reqs
 pip-extra-reqs:
-	pip-extra-reqs --requirements-file=requirements/requirements.txt src/
+	pip-extra-reqs --skip-incompatible --requirements-file=requirements/requirements.txt src/
 
 .PHONY: pip-missing-reqs
 pip-missing-reqs:
diff --git a/readthedocs.yaml b/readthedocs.yaml
@@ -1,17 +1,16 @@
 version: 2
 
-# We do this because at the time of writing we need "image: testing" for Python
-# 3.9.
 build:
-  image: testing
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
 
 python:
   install:
      - method: pip
        path: .
        extra_requirements:
            - dev
-  version: 3.9
 
 sphinx:
   builder: html
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
@@ -3,7 +3,7 @@ Sphinx-Substitution-Extensions==2020.9.30.0
 Sphinx==4.3.1
 VWS-Test-Fixtures==2021.11.5.1
 autoflake==1.4
-black==21.11b1
+black==21.12b0
 check-manifest==0.47
 doc8==0.10.1
 docker==5.0.3
@@ -14,7 +14,7 @@ flake8==4.0.1  # Lint
 freezegun==1.1.0  # Freeze time in tests
 furo==2021.11.23
 isort==5.10.1  # Lint imports
-keyring==23.3.0
+keyring==23.4.0
 mypy==0.910 # Type checking
 pip_check_reqs==2.3.2
 pydocstyle==6.1.1  # Lint docstrings
@@ -29,12 +29,12 @@ requests-mock-flask==2021.7.10.0
 sphinx-autodoc-typehints==1.12.0
 sphinx_paramlinks==0.5.2
 sphinxcontrib-httpdomain==1.8.0
-sphinxcontrib-spelling==7.2.1
-twine==3.7.0
+sphinxcontrib-spelling==7.3.0
+twine==3.7.1
 types-Flask==1.1.6
 types-freezegun==1.1.3
 types-PyYAML==6.0.1
-types-requests==2.26.0
-types-setuptools==57.4.3
+types-requests==2.26.1
+types-setuptools==57.4.4
 vulture==2.3
 vws-python==2021.3.28.2
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,10 +1,6 @@
 Pillow
 VWS-Auth-Tools
-# We add ``[tzdata]`` for Windows.
-# Building the wheel for this on Apple Silicon needs ``gcc`` - that is
-# hardcoded in the base Dockerfile.
-# This can be removed when we only support Python 3.9+.
-backports.zoneinfo[tzdata]
 flask
 requests-mock
 requests
+tzdata; sys_platform == 'win32'
diff --git a/src/mock_vws/_flask_server/dockerfiles/base/Dockerfile b/src/mock_vws/_flask_server/dockerfiles/base/Dockerfile
@@ -1,9 +1,7 @@
 FROM python:3.9.1-slim-buster
 RUN apt update --yes
 # git is needed for setuptools-scm.
-# gcc is needed to create the wheel for backports.zoneinfo, at least on Apple
-# Silicon.
-RUN apt install --yes git gcc
+RUN apt install --yes git
 COPY . /app
 WORKDIR /app
 RUN pip install .
diff --git a/src/mock_vws/_flask_server/target_manager.py b/src/mock_vws/_flask_server/target_manager.py
@@ -8,8 +8,8 @@
 import random
 from http import HTTPStatus
 from typing import Tuple
+from zoneinfo import ZoneInfo
 
-from backports.zoneinfo import ZoneInfo
 from flask import Flask, jsonify, request
 
 from mock_vws.database import VuforiaDatabase
diff --git a/src/mock_vws/_query_tools.py b/src/mock_vws/_query_tools.py
@@ -10,8 +10,7 @@
 import io
 import uuid
 from typing import Any, Dict, Set
-
-from backports.zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfo
 
 from mock_vws._base64_decoding import decode_base64
 from mock_vws._constants import ResultCodes, TargetStatuses
diff --git a/src/mock_vws/_query_validators/date_validators.py b/src/mock_vws/_query_validators/date_validators.py
@@ -4,8 +4,7 @@
 
 import datetime
 from typing import Dict, Set
-
-from backports.zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfo
 
 from mock_vws._query_validators.exceptions import (
     DateFormatNotValid,
diff --git a/src/mock_vws/_requests_mock_server/mock_web_services_api.py b/src/mock_vws/_requests_mock_server/mock_web_services_api.py
@@ -15,8 +15,8 @@
 import uuid
 from http import HTTPStatus
 from typing import Callable, Dict, Set
+from zoneinfo import ZoneInfo
 
-from backports.zoneinfo import ZoneInfo
 from requests_mock import DELETE, GET, POST, PUT
 from requests_mock.request import _RequestObjectProxy
 from requests_mock.response import _Context
diff --git a/src/mock_vws/_services_validators/date_validators.py b/src/mock_vws/_services_validators/date_validators.py
@@ -5,8 +5,7 @@
 import datetime
 from http import HTTPStatus
 from typing import Dict
-
-from backports.zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfo
 
 from mock_vws._services_validators.exceptions import Fail, RequestTimeTooSkewed
 
diff --git a/src/mock_vws/target.py b/src/mock_vws/target.py
@@ -11,8 +11,8 @@
 import uuid
 from dataclasses import dataclass, field
 from typing import TypedDict
+from zoneinfo import ZoneInfo
 
-from backports.zoneinfo import ZoneInfo
 from PIL import Image, ImageStat
 
 from mock_vws._constants import TargetStatuses
diff --git a/tests/mock_vws/test_date_header.py b/tests/mock_vws/test_date_header.py
@@ -6,10 +6,10 @@
 from http import HTTPStatus
 from typing import Dict
 from urllib.parse import urlparse
+from zoneinfo import ZoneInfo
 
 import pytest
 import requests
-from backports.zoneinfo import ZoneInfo
 from freezegun import freeze_time
 from requests.structures import CaseInsensitiveDict
 from vws_auth_tools import authorization_header, rfc_1123_date
diff --git a/tests/mock_vws/test_invalid_json.py b/tests/mock_vws/test_invalid_json.py
@@ -5,10 +5,10 @@
 from datetime import datetime, timedelta
 from http import HTTPStatus
 from urllib.parse import urlparse
+from zoneinfo import ZoneInfo
 
 import pytest
 import requests
-from backports.zoneinfo import ZoneInfo
 from freezegun import freeze_time
 from requests.structures import CaseInsensitiveDict
 from vws_auth_tools import authorization_header, rfc_1123_date
diff --git a/tests/mock_vws/test_query.py b/tests/mock_vws/test_query.py
@@ -17,10 +17,10 @@
 from pathlib import Path
 from typing import Any, Dict
 from urllib.parse import urljoin
+from zoneinfo import ZoneInfo
 
 import pytest
 import requests
-from backports.zoneinfo import ZoneInfo
 from PIL import Image
 from requests import Response
 from requests_mock import POST
diff --git a/tests/mock_vws/test_target_summary.py b/tests/mock_vws/test_target_summary.py
@@ -5,10 +5,10 @@
 import datetime
 import io
 import uuid
+from zoneinfo import ZoneInfo
 
 import pytest
 from _pytest.fixtures import SubRequest
-from backports.zoneinfo import ZoneInfo
 from vws import VWS, CloudRecoService
 from vws.exceptions.vws_exceptions import UnknownTarget
 from vws.reports import TargetStatuses
diff --git a/tests/mock_vws/utils/assertions.py b/tests/mock_vws/utils/assertions.py
@@ -10,8 +10,8 @@
 import json
 from http import HTTPStatus
 from string import hexdigits
+from zoneinfo import ZoneInfo
 
-from backports.zoneinfo import ZoneInfo
 from requests import Response
 
 from mock_vws._constants import ResultCodes

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ Installation`
`5`	`5`
`6`	`6`	`pip3 install vws-python-mock`
`7`	`7`
`8`		`-This requires Python 3.9+.`
	`8`	`+This requires Python \|python-minumum-version\|\+.`