Investigate failing integration tests with Python 3.9

Author: petyaslavova

.github/workflows/integration.yaml

@@ -33,31 +33,6 @@ env:
   CURRENT_REDIS_VERSION: '8.2'
 
 jobs:
-  dependency-audit:
-    name: Dependency audit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: pypa/[email protected]
-        with:
-          inputs: dev_requirements.txt
-          ignore-vulns: |
-            GHSA-w596-4wvx-j9j6  # subversion related git pull, dependency for pytest. There is no impact here.
-
-  lint:
-    name: Code linters
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: 3.9
-          cache: 'pip'
-      - name: run code linters
-        run: |
-          pip install -r dev_requirements.txt
-          pip uninstall -y redis  # uninstall Redis package installed via redis-entraid
-          invoke linters
 
   redis_version:
     runs-on: ubuntu-latest
@@ -76,8 +51,8 @@ jobs:
       max-parallel: 15
       fail-fast: false
       matrix:
-        redis-version: ['8.4-M01-pre', '${{ needs.redis_version.outputs.CURRENT }}', '8.0.2' ,'7.4.4', '7.2.9']
-        python-version: ['3.9', '3.13']
+        redis-version: ['${{ needs.redis_version.outputs.CURRENT }}']
+        python-version: ['3.9']
         parser-backend: ['plain']
         event-loop: ['asyncio']
     env:
@@ -94,14 +69,14 @@ jobs:
 
   python-compatibility-tests:
     runs-on: ubuntu-latest
-    needs: [ redis_version, tests ]
+    needs: [ redis_version ]
     timeout-minutes: 60
     strategy:
       max-parallel: 15
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
-        python-version: ['3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
+        python-version: ['pypy-3.9', 'pypy-3.10']
         parser-backend: [ 'plain' ]
         event-loop: [ 'asyncio' ]
     env:
@@ -116,42 +91,16 @@ jobs:
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
 
-  hiredis-tests:
-    runs-on: ubuntu-latest
-    needs: [redis_version, tests]
-    timeout-minutes: 60
-    strategy:
-      max-parallel: 15
-      fail-fast: false
-      matrix:
-        redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
-        python-version: [ '3.9', '3.13']
-        parser-backend: [ 'hiredis' ]
-        hiredis-version: [ '>=3.2.0', '<3.0.0' ]
-        event-loop: [ 'asyncio' ]
-    env:
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}} (${{ matrix.hiredis-version }}); EL:${{matrix.event-loop}}
-    steps:
-      - uses: actions/checkout@v5
-      - name: Run tests
-        uses: ./.github/actions/run-tests
-        with:
-          python-version: ${{ matrix.python-version }}
-          parser-backend: ${{ matrix.parser-backend }}
-          redis-version: ${{ matrix.redis-version }}
-          hiredis-version: ${{ matrix.hiredis-version }}
-
   uvloop-tests:
     runs-on: ubuntu-latest
-    needs: [redis_version, tests]
+    needs: [redis_version]
     timeout-minutes: 60
     strategy:
       max-parallel: 15
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
-        python-version: [ '3.9', '3.13' ]
+        python-version: [ '3.9']
         parser-backend: [ 'plain' ]
         event-loop: [ 'uvloop' ]
     env:
@@ -167,33 +116,14 @@ jobs:
           redis-version: ${{ matrix.redis-version }}
           event-loop: ${{ matrix.event-loop }}
 
-  build-and-test-package:
-    name: Validate building and installing the package
-    runs-on: ubuntu-latest
-    needs: [tests]
-    strategy:
-      fail-fast: false
-      matrix:
-        extension: ['tar.gz', 'whl']
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: 3.9
-      - name: Run installed unit tests
-        env:
-          CLIENT_LIBS_TEST_IMAGE_TAG: ${{ env.CURRENT_REDIS_VERSION }}
-          CLIENT_LIBS_TEST_STACK_IMAGE_TAG: ${{ env.CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG }}
-        run: |
-          bash .github/workflows/install_and_test.sh ${{ matrix.extension }}
 
   install-package-from-commit:
     name: Install package from commit hash
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
+        python-version: ['3.9', 'pypy-3.9', 'pypy-3.10']
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6

dev_requirements.txt

@@ -3,15 +3,22 @@ click==8.0.4
 invoke==2.2.0
 mock
 packaging>=20.4
+
 pytest
 pytest-asyncio>=0.23.0
 pytest-cov
+pytest-cov==6.2.1 ; platform_python_implementation == "PyPy"
+coverage<7.10.6 ; platform_python_implementation == "PyPy"
 pytest-profiling==1.8.1
 pytest-timeout
+
 ruff==0.9.6
 ujson>=4.2.0
-uvloop
+uvloop<=0.21.0; platform_python_implementation == "CPython"
 vulture>=2.3.0
-numpy>=1.24.0
+
+numpy>=1.24.0 ; platform_python_implementation == "CPython"
+numpy>=1.24.0,<2.0 ; platform_python_implementation == "PyPy"
+
 redis-entraid==1.0.0
 pybreaker>=1.4.0

tests/test_multiprocessing.py

@@ -80,14 +80,18 @@ def target(conn, ev):
             with pytest.raises(ConnectionError):
                 conn.send_command("ping")
 
-        ev = multiprocessing.Event()
+        ev = self._mp_context.Event()
         proc = self._mp_context.Process(target=target, args=(conn, ev))
         proc.start()
 
         conn.disconnect()
         ev.set()
 
         proc.join(3)
+        if proc.exitcode is None:
+            proc.terminate()
+            proc.join(3)
+            pytest.xfail("Intermittent PyPy/Linux fork+Event hang; see pypy/pypy#5268")
         assert proc.exitcode == 0
 
     @pytest.mark.parametrize("max_connections", [2, None])
@@ -185,14 +189,18 @@ def target(pool, disconnect_event):
                 assert conn.send_command("ping") is None
                 assert conn.read_response() == b"PONG"
 
-        ev = multiprocessing.Event()
+        ev = self._mp_context.Event()
 
         proc = self._mp_context.Process(target=target, args=(pool, ev))
         proc.start()
 
         pool.disconnect()
         ev.set()
         proc.join(3)
+        if proc.exitcode is None:
+            proc.terminate()
+            proc.join(3)
+            pytest.xfail("Intermittent PyPy/Linux fork+Event hang; see pypy/pypy#5268")
         assert proc.exitcode == 0
 
     def test_redis_client(self, r):