build: fix tox

Author: alandtse

.pre-commit-config.yaml

@@ -30,21 +30,21 @@ repos:
       - id: check-yaml
         exclude: ^recipes/.*
     repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v6.0.0
 
   # --- Commit msg checks ---
   - hooks:
       - id: commitizen
         stages: ["commit-msg"]
     repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.27.1
+    rev: v4.13.7
 
   # --- Strip output from .ipynb files ---
   - hooks:
       - id: nbstripout
         files: ".ipynb"
     repo: https://github.com/kynan/nbstripout
-    rev: 0.5.0
+    rev: 0.9.0
 
   # --- Linters ---
   - hooks:
@@ -54,8 +54,8 @@ repos:
   - hooks:
       - id: black
     repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 26.1.0
   - repo: https://github.com/pre-commit/mirrors-prettier
     hooks:
       - id: prettier
-    rev: v2.7.1
+    rev: v4.0.0-alpha.8

authcaptureproxy/__init__.py

@@ -1,16 +1,9 @@
 #  SPDX-License-Identifier: Apache-2.0
 """Metadata for this auth_capture_proxy."""
-import logging
-
-try:
-    from importlib_metadata import PackageNotFoundError
-    from importlib_metadata import metadata as __load
-except ModuleNotFoundError:
-    from importlib.metadata import PackageNotFoundError  # type: ignore
-    from importlib.metadata import metadata as __load  # type: ignore
 
-# If you need to support Python 3.7, change to importlib_metadata (underscore, not dot)
-# and then list importlib_metadata to [tool.poetry.dependencies] and docs/requirements.txt
+import logging
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import metadata as __load
 from pathlib import Path
 
 from authcaptureproxy import const

authcaptureproxy/helper.py

@@ -4,6 +4,7 @@
 
 Helper files.
 """
+
 import ast
 import json
 import logging
@@ -150,7 +151,7 @@ def swap_url(
         url = URL(url)
     old_url_string: Text = str(old_url.with_query({}))
     new_url_string: Text = str(new_url.with_query({}))
-    old_query: MultiDict = url.query
+    old_query: MultiDictProxy = url.query
     url_string = str(url.with_query({}))
     # ensure both paths end with "/" if one of them does
     if (
@@ -220,7 +221,7 @@ def replace_empty_url(new_url: URL, url: URL) -> URL:
 
 
 def get_nested_dict_keys(
-    nested_dict: Mapping[Text, Union[Callable, Dict[Text, Callable]]]
+    nested_dict: Mapping[Text, Union[Callable, Dict[Text, Callable]]],
 ) -> List[Text]:
     """Get list of nested dict keys.
 

docs/conf.py

@@ -36,10 +36,16 @@ def find(key: str, default: Optional[Any] = None, as_type: Type[Any] = str) -> O
 # Basic information, used by Sphinx
 # Leave language as None unless you have multiple translations
 language = None
-project = str(find("tool.poetry.name", default=""))
-version = find("tool.poetry.version", default="")
+project = str(find("project.name", default=""))
+version = find("project.version", default="")
 release = version
-author = ", ".join(find("tool.poetry.authors", default="", as_type=list))  # type: ignore
+authors = find("project.authors", default=[], as_type=list)
+if isinstance(authors, list) and len(authors) > 0 and isinstance(authors[0], dict):
+    author = ", ".join(str(a.get("name", "")) for a in authors)
+elif isinstance(authors, list):
+    author = ", ".join(str(a) for a in authors)
+else:
+    author = ""
 
 # Copyright string (for documentation)
 # It's not clear whether we're supposed to, but we'll add the license

poetry.lock

@@ -13,7 +13,7 @@ authors = [
 maintainers = [
     { name = "Alan D. Tse", email = "alandtse@gmail.com" }
 ]
-license = { text = "Apache-2.0" }
+license = "Apache-2.0"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Natural Language :: English",

pyproject.toml

@@ -32,9 +32,7 @@ async def post(self, url: str, **kwargs):
             }
         )
         req = httpx.Request("POST", url)
-        return httpx.Response(
-            200, request=req, text="ok", headers={"Content-Type": "text/plain"}
-        )
+        return httpx.Response(200, request=req, text="ok", headers={"Content-Type": "text/plain"})
 
 
 async def _make_request(
@@ -57,12 +55,18 @@ async def _make_request(
 
     loop = asyncio.get_running_loop()
 
+    class MockProtocol(asyncio.BaseProtocol):
+        def __init__(self):
+            self._reading_paused = False
+
+    protocol = MockProtocol()
+
     # aiohttp 3.9: StreamReader(protocol, limit, loop)
     # newer aiohttp: signature varies; keep this compatible.
     try:
-        payload = StreamReader(None, 2**16, loop=loop)  # type: ignore[arg-type]
+        payload = StreamReader(protocol, 2**16, loop=loop)  # type: ignore[arg-type]
     except TypeError:
-        payload = StreamReader(protocol=None, limit=2**16, loop=loop)  # type: ignore[arg-type]
+        payload = StreamReader(protocol=protocol, limit=2**16, loop=loop)  # type: ignore[arg-type]
 
     if body:
         payload.feed_data(body)

tests/test_regression_headers_and_json_parsing.py

@@ -39,10 +39,12 @@ commands =
     poetry run pytest tests/
 
 [testenv:cov]
+basepython = python3.10
 commands =
     poetry run pytest --cov-report term-missing --cov=authcaptureproxy --cov-report=xml:cov.xml tests/
 
 [testenv:lint]
+basepython = python3.10
 commands =
     poetry run isort authcaptureproxy
     poetry run black authcaptureproxy
@@ -56,12 +58,14 @@ commands =
     poetry run flake8 --ignore=D100,D101,D102,D103,D104,S101,W503,E203,E225,E301,E302,E501,D107,D200,D205,D400,D403,D409,D410,D411,D212,W391,W293 tests
 
 [testenv:typing]
+basepython = python3.10
 commands =
     poetry run mypy --show-error-codes authcaptureproxy
     poetry run mypy --show-error-codes docs
     poetry run mypy --show-error-codes tests
 
 [testenv:docs]
+basepython = python3.10
 commands =
     poetry run sphinx-build -b html docs docs/html