Merge branch 'main' into release/v1.14.1

Author: altendky

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    # Check for updates once a week
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    target-branch: "main"
+    open-pull-requests-limit: 10
+    pull-request-branch-name:
+      # Separate sections of the branch name with a hyphen
+      # for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
+      separator: "-"

.github/workflows/ci.yml

@@ -9,6 +9,9 @@ on:
   pull_request:
     branches: 
       - "*"
+  release:
+    types:
+      - published
   schedule:
     # Daily at 05:47
     - cron: '47 5 * * *'
@@ -21,8 +24,28 @@ env:
   PIP_NO_PYTHON_VERSION_WARNING: 1
 
 jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    container: docker://python:3.11-buster
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: |
+          python -m venv venv
+          venv/bin/pip install --upgrade pip
+          venv/bin/pip install build
+          venv/bin/python -m build --outdir dist/
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: dist
+          path: dist/*
+          if-no-files-found: error
+
   test:
     name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }}
+    needs: build
     runs-on: ${{ matrix.os.runs-on }}
     container: ${{ matrix.os.container[matrix.python.docker] }}
     strategy:
@@ -35,16 +58,18 @@ jobs:
             container:
               "2.7": docker://python:2.7-buster
               "3.5": docker://python:3.5-buster
-              "3.6": docker://python:3.6-buster
-              "3.7": docker://python:3.7-buster
-              "3.8": docker://python:3.8-buster
-              "3.9": docker://python:3.9-buster
-              "3.10": docker://python:3.10-buster
-              "3.11": docker://python:3.11-buster
-              "pypy2.7": docker://pypy:2.7-buster
-              "pypy3.7": docker://pypy:3.7-buster
-              "pypy3.8": docker://pypy:3.8-buster
-              "pypy3.9": docker://pypy:3.9-buster
+              "3.6": docker://python:3.6-bullseye
+              "3.7": docker://python:3.7-bookworm
+              "3.8": docker://python:3.8-bookworm
+              "3.9": docker://python:3.9-bookworm
+              "3.10": docker://python:3.10-bookworm
+              "3.11": docker://python:3.11-bookworm
+              "3.12": docker://python:3.12-bookworm
+              "pypy2.7": docker://pypy:2.7-bookworm
+              "pypy3.7": docker://pypy:3.7-bullseye
+              "pypy3.8": docker://pypy:3.8-bookworm
+              "pypy3.9": docker://pypy:3.9-bookworm
+              "pypy3.10": docker://pypy:3.10-bookworm
           - name: 🪟
             runs-on: windows-latest
             python_platform: win32
@@ -100,6 +125,12 @@ jobs:
             docker: "3.11"
             implementation: cpython
             major: 3
+          - name: CPython 3.12
+            tox: py312
+            action: "3.12"
+            docker: "3.12"
+            implementation: cpython
+            major: 3
 # disabled due to installation failures
 # https://github.com/pytest-dev/pytest-twisted/pull/157
 #           - name: PyPy 2.7
@@ -126,6 +157,12 @@ jobs:
             docker: pypy3.9
             implementation: pypy
             major: 3
+          - name: PyPy 3.10
+            tox: pypy310
+            action: pypy-3.10
+            docker: pypy3.10
+            implementation: pypy
+            major: 3
         reactor:
           - name: default
             tox: default
@@ -160,6 +197,10 @@ jobs:
               action: "3.11"
             reactor:
               tox: pyside2
+          - python:
+              action: "3.12"
+            reactor:
+              tox: pyside2
           - python:
               major: 2
             reactor:
@@ -173,13 +214,13 @@ jobs:
             reactor:
               tox: pyside2
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Enable Problem Matchers
         run: |
           echo "::add-matcher::.github/local-problem-matchers.json"
       - name: Set up ${{ matrix.python.name }}
         if: ${{ job.container == '' }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           # This allows the matrix to specify just the major.minor version while still
           # expanding it to get the latest patch version including alpha releases.
@@ -215,21 +256,27 @@ jobs:
       - name: Install
         run: |
           pip install tox
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
       - name: Test
+        shell: bash
         run: |
-          tox -v -e "${{ matrix.python.tox }}-${{ matrix.reactor.tox }}reactor"
+          tox --installpkg dist/*.whl -v -e "${{ matrix.python.tox }}-${{ matrix.reactor.tox }}reactor"
+
   linting:
     name: Linting
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python:
-          - short: 39
-            dotted: 3.9
+          - short: 311
+            dotted: "3.11"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python.dotted }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python.dotted }}
           architecture: x64
@@ -239,12 +286,33 @@ jobs:
       - name: Test
         run: |
           tox -v -e linting
+
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    needs:
+      - build
+      - test
+      - linting
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        if: github.event_name == 'release'
+        with:
+          packages-dir: dist/
+          skip-existing: true
+
   all:
     name: All
     runs-on: ubuntu-latest
     needs:
+      - build
       - test
       - linting
+      - publish
     steps:
       - name: This
         shell: python

testing/test_basic.py

@@ -1345,5 +1345,5 @@ def test_inline_callbacks(x):
         yield
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=3 * timeout)
     assert_outcomes(rr, {"failed": 1})