Merge branch 'main' into dependabot-github_actions-main-actions-setup-python-6

Author: altendky

.github/workflows/ci.yml

@@ -32,14 +32,14 @@ jobs:
     runs-on: ubuntu-latest
     container: docker://python:3.11-buster
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - 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
+      - uses: actions/upload-artifact@v5
         if: always()
         with:
           name: dist
@@ -83,7 +83,7 @@ jobs:
             matrix: macos
             runs-on: 
               arm: macos-latest
-              intel: macos-13
+              intel: macos-15-intel
             python_platform: darwin
         python:
           - name: CPython 2.7
@@ -262,7 +262,7 @@ jobs:
             reactor:
               tox: pyside2
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Enable Problem Matchers
         run: |
           echo "::add-matcher::.github/local-problem-matchers.json"
@@ -304,7 +304,7 @@ jobs:
       - name: Install
         run: |
           pip install tox
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: dist
           path: dist/
@@ -322,7 +322,7 @@ jobs:
           - short: 311
             dotted: "3.11"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python.dotted }}
         uses: actions/setup-python@v6
         with:
@@ -343,7 +343,7 @@ jobs:
       - test
       - linting
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: dist
           path: dist/

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
--   repo: https://github.com/ambv/black
+-   repo: https://github.com/psf/black
     rev: stable
     hooks:
     - id: black

CONTRIBUTING.rst

@@ -17,14 +17,10 @@ What it takes to add a new reactor:
   * Add conditional ``deps`` for the new reactor such as ``foo: foobar`` to the appropriate test environments
   * Add ``fooreactor: pytest --reactor=foo`` to the commands list
 
-* In ``.travis.yml``
+* In ``.github/workflows/ci.yml``
 
   * Consider any extra system packages which may be required
 
-* In ``appveyor.yml``
-
-  * Add the new reactor environment to the ``TOXENV`` for each relevant Python
-  
 Reference reactor additions:
   * `asyncio`_
   * `qt5reactor`_

README.rst

@@ -4,12 +4,12 @@
 pytest-twisted - test twisted code with pytest
 ==============================================================================
 
-|PyPI| |Pythons| |Travis| |AppVeyor| |Actions| |Black|
+|PyPI| |Pythons| |Actions| |Black|
 
 :Authors: Ralf Schmitt, Kyle Altendorf, Victor Titor
 :Version: 1.14.3
 :Date:    2024-08-21
-:Download: https://pypi.python.org/pypi/pytest-twisted#downloads
+:Download: https://pypi.org/project/pytest-twisted/#files
 :Code: https://github.com/pytest-dev/pytest-twisted
 
 
@@ -227,26 +227,18 @@ v1.9
 
 .. |PyPI| image:: https://img.shields.io/pypi/v/pytest-twisted.svg
    :alt: PyPI version
-   :target: https://pypi.python.org/pypi/pytest-twisted
+   :target: https://pypi.org/project/pytest-twisted/
 
 .. |Pythons| image:: https://img.shields.io/pypi/pyversions/pytest-twisted.svg
    :alt: Supported Python versions
-   :target: https://pypi.python.org/pypi/pytest-twisted
-
-.. |Travis| image:: https://travis-ci.org/pytest-dev/pytest-twisted.svg?branch=master
-   :alt: Travis build status
-   :target: https://travis-ci.org/pytest-dev/pytest-twisted
-
-.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/eb1vp9hysp463c66/branch/master?svg=true
-   :alt: AppVeyor build status
-   :target: https://ci.appveyor.com/project/pytestbot/pytest-twisted
+   :target: https://pypi.org/project/pytest-twisted/
 
 .. |Actions| image:: https://img.shields.io/github/workflow/status/pytest-dev/pytest-twisted/CI/master?logo=GitHub-Actions
    :alt: GitHub Actions build status
    :target: https://github.com/pytest-dev/pytest-twisted/actions?query=branch%3Amaster
 
 .. |Black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :alt: Black code style
-   :target: https://github.com/ambv/black
+   :target: https://github.com/psf/black
 
 .. _guide: CONTRIBUTING.rst

tox.ini

@@ -13,6 +13,7 @@ deps=
     twisted
     py37,py38,py39,pypy37,pypy38: hypothesis
     pyqt5reactor,pyside2reactor: pytest-qt
+    pyqt5reactor,pyside2reactor: pytest-qt<4.5.0; python_version >= "3.9"
     pyqt5reactor,pyside2reactor: pytest-xvfb
     pyqt5reactor,pyside2reactor: pywin32; sys_platform == 'win32'
 extras=