tidy

Author: altendky

.github/workflows/ci.yml

@@ -149,7 +149,7 @@ jobs:
       - name: Install
         run: |
           pip install --upgrade pip setuptools wheel
-          pip install --upgrade tox requests urllib3
+          pip install --upgrade tox
       - uses: twisted/python-info-action@v1.0.1
       - name: Add PyPy Externals
         if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}

requirements-tests.txt

@@ -16,7 +16,7 @@ verboselogs >= 1.5
 tornado==4.5.3
 # using platform_python_implementation rather than
 # implementation_name for Python 2 support
-Twisted[conch,serial]>=20.3.0; platform_python_implementation == "CPython" or sys_platform != "win32"
+Twisted[conch,serial]>=20.3.0; platform_python_implementation != "PyPy" or sys_platform != "win32"
 # pywin32 isn't supported on pypy
 # https://github.com/mhammond/pywin32/issues/1289
 Twisted[conch]>=20.3.0; platform_python_implementation == "PyPy" and sys_platform == "win32"

setup.py

@@ -99,7 +99,7 @@
         'twisted': [
             # using platform_python_implementation rather than
             # implementation_name for Python 2 support
-            'Twisted[conch,serial]>=20.3.0; platform_python_implementation == "CPython" or sys_platform != "win32"',
+            'Twisted[conch,serial]>=20.3.0; platform_python_implementation != "PyPy" or sys_platform != "win32"',
             # pywin32 isn't supported on pypy
             # https://github.com/mhammond/pywin32/issues/1289
             'Twisted[conch]>=20.3.0; platform_python_implementation == "PyPy" and sys_platform == "win32"',