Merge branch 'master' into feature/dependabot

.github/workflows/check-docs.yml

@@ -11,8 +11,8 @@ jobs:
     name: Check Docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - run: pip install nox

.github/workflows/publish-docs.yml

@@ -13,8 +13,8 @@ jobs:
     name: Build & Publish
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.10"
     - run: pip install nox

.github/workflows/test.yml

@@ -20,31 +20,35 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - run: pip install nox
     - name: Test
       run: nox -N -s test-${{ matrix.python-version }} -- -v
     - name: Upload coverage report
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4.5.0
       with:
         name: Python ${{ matrix.python-version }}
         files: ./coverage.xml
         fail_ci_if_error: true
+        slug: lundberg/respx
+        token: ${{ secrets.CODECOV_TOKEN }}
+      env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   check-types:
     name: Check Typing
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - run: pip install nox
       - name: Run mypy
         run: nox -N -s mypy

README.md

@@ -78,6 +78,6 @@ Install with pip:
 $ pip install respx
 ```
 
-Requires Python 3.7+ and HTTPX 0.21+. See
+Requires Python 3.8+ and HTTPX 0.25+. See
 [Changelog](https://github.com/lundberg/respx/blob/master/CHANGELOG.md) for older HTTPX
 compatibility.

docs/index.md

@@ -68,5 +68,5 @@ Install with pip:
 $ pip install respx
 ```
 
-Requires Python 3.7+ and HTTPX 0.21+.
+Requires Python 3.8+ and HTTPX 0.25+.
 See [Changelog](https://github.com/lundberg/respx/blob/master/CHANGELOG.md) for older HTTPX compatibility.

flake.nix

@@ -13,22 +13,22 @@
         pkgsUnstable = nixpkgsUnstable.legacyPackages.${system};
       in {
         packages = flakeUtils.lib.flattenTree {
+          python313 = pkgs.python313;
           python312 = pkgs.python312;
           python311 = pkgs.python311;
           python310 = pkgs.python310;
           python39 = pkgs.python39;
           python38 = pkgs22.python38;
-          python37 = pkgs22.python37;
           go-task = pkgsUnstable.go-task;
         };
         devShell = pkgs.mkShell {
           buildInputs = with self.packages.${system}; [
+            python313
             python312
             python311
             python310
             python39
             python38
-            python37
             go-task
           ];
           shellHook = ''

noxfile.py

@@ -5,7 +5,7 @@
 nox.options.keywords = "test + mypy"
 
 
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"])
+@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12"])
 def test(session):
     deps = ["pytest", "pytest-asyncio", "pytest-cov", "trio", "starlette", "flask"]
     session.install("--upgrade", *deps)
@@ -17,7 +17,7 @@ def test(session):
     session.run("pytest", *session.posargs)
 
 
-@nox.session(python="3.7")
+@nox.session(python="3.8")
 def mypy(session):
     session.install("--upgrade", "mypy")
     session.install("-e", ".")

respx/models.py

@@ -366,7 +366,8 @@ def _resolve_side_effect(
             raise SideEffectError(self, origin=effect)
 
         # Handle Exception `type` side effect
-        elif isinstance(effect, type) and issubclass(effect, Exception):
+        elif isinstance(effect, type):
+            assert issubclass(effect, Exception)
             raise SideEffectError(
                 self,
                 origin=(

respx/utils.py

@@ -5,6 +5,7 @@
     Any,
     Dict,
     List,
+    Literal,
     NamedTuple,
     Optional,
     Tuple,
@@ -15,11 +16,6 @@
 )
 from urllib.parse import parse_qsl
 
-try:
-    from typing import Literal  # type: ignore[attr-defined]
-except ImportError:  # pragma: no cover
-    from typing_extensions import Literal
-
 import httpx
 
 

setup.cfg

@@ -36,7 +36,7 @@ skip_covered = True
 show_missing = True
 
 [mypy]
-python_version = 3.7
+python_version = 3.8
 files = respx,tests
 pretty = True
 

setup.py

@@ -23,7 +23,6 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -40,6 +39,6 @@
     entry_points={"pytest11": ["respx = respx.plugin"]},
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.7",
-    install_requires=["httpx>=0.21.0"],
+    python_requires=">=3.8",
+    install_requires=["httpx>=0.25.0,<0.28.0"],
 )