Merge branch 'trunk' into typing

twisted · Nov 6, 2023 · 28b6af9 · 28b6af9
2 parents 86eca52 + 707c833
commit 28b6af9
Show file tree

Hide file tree

Showing 15 changed files with 137 additions and 65 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,13 +12,13 @@ jobs:
     timeout-minutes: 5
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.11'
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key:
@@ -38,13 +38,13 @@ jobs:
     timeout-minutes: 5
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: "3.11"
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key:
@@ -53,7 +53,7 @@ jobs:
           ${{ runner.os }}-pip-docs-
           ${{ runner.os }}-pip-
 
-    - run: python -m pip install tox
+    - run: python -m pip install 'tox<4'
 
     - run: tox -q -e docs
 
@@ -65,27 +65,47 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-          python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8", "pypy-3.9"]
+          # Python versions common to lowest and latest
+          python-version: ["3.8", "3.9", "3.10", "pypy-3.9"]
           twisted-version: ["lowest", "latest"]
           experimental: [false]
 
           include:
-          - python-version: "3.8"
-            twisted-version: "trunk"
-            experimental: true
+          # Pythons too old for latest
+          - python-version: "3.7"
+            twisted-version: "lowest"
+            experimental: false
+
+          - python-version: "pypy-3.8"
+            twisted-version: "lowest"
+            experimental: false
+
+          # Pythons too new for lowest
+          - python-version: "3.11"
+            twisted-version: "latest"
+            experimental: false
 
+          - python-version: "3.12"
+            twisted-version: "latest"
+            experimental: false
+
+          - python-version: "pypy-3.10"
+            twisted-version: "latest"
+            experimental: false
+
+          # Experimental trunk build
           - python-version: "3.9"
             twisted-version: "trunk"
             experimental: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key:
@@ -103,8 +123,11 @@ jobs:
           "3.8": "py38",
           "3.9": "py39",
           "3.10": "py310",
+          "3.11": "py311",
+          "3.12": "py312",
           "pypy-3.8": "pypy3",
           "pypy-3.9": "pypy3",
+          "pypy-3.10": "pypy3",
         }
         factor = table["${{ matrix.python-version }}"]
         print("::set-output name=value::" + factor)
@@ -119,3 +142,28 @@ jobs:
         COVERALLS_REPO_TOKEN: 4nctuKHTnVtbdmty2FgdO3iiWm1nb7xc4
         COVERALLS_FLAG_NAME: python_${{ matrix.python-version }}-twisted_${{ matrix.twisted-version }}
         COVERALLS_PARALLEL: true
+
+  # Helper so that on GitHub repo settings we can configure to single job.
+  # Then required jobs can be updated directly form the code,
+  # without having to go the GitHub repo setting -> Protected branch
+  # and all the clicking.
+  treq-required:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: ${{ !cancelled() }}
+    # Add here the jobs that should block the merge of a PR.
+    needs:
+      - lint
+      - docs
+      - test
+    steps:
+      - name: Require all successes
+        shell: python3 {0}
+        env:
+          RESULTS: ${{ toJSON(needs.*.result) }}
+        run: |
+          import json
+          import os
+          import sys
+          results = json.loads(os.environ["RESULTS"])
+          sys.exit(0 if all(result == "success" for result in results) else 1)
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@ MANIFEST
 coverage
 htmlcov
 _trial_temp*
-.tox
+/.tox
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,35 @@ Changelog
 
 .. towncrier release notes start
 
+23.11.0 (2023-11-03)
+====================
+
+Features
+--------
+
+- When the collector passed to ``treq.collect(response, collector)`` throws an exception, that error will now be returned to the caller of ``collect()`` via the result ``Deferred``, and the underlying HTTP transport will be closed. (`#347 <https://github.com/twisted/treq/issues/347>`__)
+- Python 3.11 is now supported. (`#364 <https://github.com/twisted/treq/issues/364>`__)
+- Python 3.12 is now supported. (`#375 <https://github.com/twisted/treq/issues/375>`__)
+- PyPy 3.9 is now supported. (`#365 <https://github.com/twisted/treq/issues/365>`__)
+- PyPy 3.10 is now supported. (`#374 <https://github.com/twisted/treq/issues/374>`__)
+
+
+Deprecations and Removals
+-------------------------
+
+- The minimum supported Twisted version has increased to 22.10.0. Older versions are no longer tested in CI. (`#374 <https://github.com/twisted/treq/issues/374>`__)
+- Support for Python 3.6, which has reached end of support, has been dropped. (`#363 <https://github.com/twisted/treq/issues/363>`__)
+- Support for Python 3.7, which reaches end of support 2023-06-27, is deprecated. This is the last release with support for Python 3.7. (`#361 <https://github.com/twisted/treq/issues/361>`__)
+- Support for PyPy 3.7, which has reached end of support, has been removed. (`#365 <https://github.com/twisted/treq/issues/365>`__)
+- Support for PyPy 3.8, which has reached end of support, is deprecated. This is the last release with support for PyPy 3.8. (`#374 <https://github.com/twisted/treq/issues/374>`__)
+
+
+Misc
+----
+
+- `#349 <https://github.com/twisted/treq/issues/349>`__, `#350 <https://github.com/twisted/treq/issues/350>`__, `#352 <https://github.com/twisted/treq/issues/352>`__
+
+
 22.2.0 (2022-02-08)
 ===================
 

diff --git a/changelog.d/347.feature.rst b/changelog.d/347.feature.rst
diff --git a/changelog.d/349.misc.rst b/changelog.d/349.misc.rst
diff --git a/changelog.d/350.misc.rst b/changelog.d/350.misc.rst
diff --git a/changelog.d/352.misc.rst b/changelog.d/352.misc.rst
diff --git a/changelog.d/363.removal.rst b/changelog.d/363.removal.rst
diff --git a/changelog.d/365.feature.rst b/changelog.d/365.feature.rst
diff --git a/changelog.d/365.removal.rst b/changelog.d/365.removal.rst
diff --git a/setup.py b/setup.py
@@ -7,10 +7,11 @@
     "Operating System :: OS Independent",
     "Framework :: Twisted",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]

diff --git a/src/treq/_version.py b/src/treq/_version.py
@@ -7,5 +7,5 @@
 
 from incremental import Version
 
-__version__ = Version("treq", 22, 2, 0)
+__version__ = Version("treq", 23, 11, 0)
 __all__ = ["__version__"]