diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml index d84789b767..f4c3632261 100644 --- a/.github/workflows/test-integrations-tasks.yml +++ b/.github/workflows/test-integrations-tasks.yml @@ -22,100 +22,6 @@ env: CACHED_BUILD_PATHS: | ${{ github.workspace }}/dist-serverless jobs: - test-tasks-latest: - name: Tasks (latest) - timeout-minutes: 30 - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - python-version: ["3.7","3.12","3.13"] - # python3.6 reached EOL and is no longer being supported on - # new versions of hosted runners on Github Actions - # ubuntu-20.04 is the last version that supported python3.6 - # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877 - os: [ubuntu-22.04] - # Use Docker container only for Python 3.6 - container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }} - steps: - - uses: actions/checkout@v5.0.0 - - uses: actions/setup-python@v6 - if: ${{ matrix.python-version != '3.6' }} - with: - python-version: ${{ matrix.python-version }} - allow-prereleases: true - - name: Start Redis - uses: supercharge/redis-github-action@1.8.0 - - name: Install Java - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: '21' - - name: Setup Test Env - run: | - pip install "coverage[toml]" tox - - name: Erase coverage - run: | - coverage erase - - name: Test arq latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-arq-latest" - - name: Test beam latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-beam-latest" - - name: Test celery latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-celery-latest" - - name: Test dramatiq latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-dramatiq-latest" - - name: Test huey latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-huey-latest" - - name: Test ray latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-ray-latest" - - name: Test rq latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-rq-latest" - - name: Test spark latest - run: | - set -x # print commands that are executed - ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest" - - name: Generate coverage XML (Python 3.6) - if: ${{ !cancelled() && matrix.python-version == '3.6' }} - run: | - export COVERAGE_RCFILE=.coveragerc36 - coverage combine .coverage-sentry-* - coverage xml --ignore-errors - - name: Generate coverage XML - if: ${{ !cancelled() && matrix.python-version != '3.6' }} - run: | - coverage combine .coverage-sentry-* - coverage xml - - name: Upload coverage to Codecov - if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.5.1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: coverage.xml - # make sure no plugins alter our coverage reports - plugins: noop - verbose: true - - name: Upload test results to Codecov - if: ${{ !cancelled() }} - uses: codecov/test-results-action@v1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: .junitxml - verbose: true test-tasks-pinned: name: Tasks (pinned) timeout-minutes: 30 diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index 87f181c6e3..7d6a519b6b 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -292,6 +292,17 @@ "requests": { "package": "requests", }, + "rq": { + "package": "rq", + "deps": { + # https://github.com/jamesls/fakeredis/issues/245 + # https://github.com/cunla/fakeredis-py/issues/341 + "*": ["fakeredis<2.28.0"], + "<0.9": ["fakeredis<1.0", "redis<3.2.2"], + ">=0.9,<0.14": ["fakeredis>=1.0,<1.7.4"], + "py3.6,py3.7": ["fakeredis!=2.26.0"], + }, + }, "sanic": { "package": "sanic", "deps": { diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index 5a44baec24..1ca9319c2e 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -70,7 +70,6 @@ # Integrations that can be migrated -- we should eventually remove all # of these from the IGNORE list "requests", - "rq", } diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index f8112b7ff5..6931b64cfc 100755 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -57,13 +57,6 @@ envlist = # Requests {py3.6,py3.8,py3.12,py3.13}-requests - # RQ (Redis Queue) - {py3.6}-rq-v{0.6} - {py3.6,py3.9}-rq-v{0.13,1.0} - {py3.6,py3.11}-rq-v{1.5,1.10} - {py3.7,py3.11,py3.12}-rq-v{1.15,1.16} - {py3.7,py3.12,py3.13}-rq-latest - # === Integrations - Auto-generated === # These come from the populate_tox.py script. Eventually we should move all # integration tests there. @@ -133,24 +126,6 @@ deps = # Requests requests: requests>=2.0 - # RQ (Redis Queue) - # https://github.com/jamesls/fakeredis/issues/245 - rq-v{0.6}: fakeredis<1.0 - rq-v{0.6}: redis<3.2.2 - rq-v{0.13,1.0,1.5,1.10}: fakeredis>=1.0,<1.7.4 - rq-v{1.15,1.16}: fakeredis<2.28.0 - {py3.6,py3.7}-rq-v{1.15,1.16}: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341 - rq-latest: fakeredis<2.28.0 - {py3.6,py3.7}-rq-latest: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341 - rq-v0.6: rq~=0.6.0 - rq-v0.13: rq~=0.13.0 - rq-v1.0: rq~=1.0.0 - rq-v1.5: rq~=1.5.0 - rq-v1.10: rq~=1.10.0 - rq-v1.15: rq~=1.15.0 - rq-v1.16: rq~=1.16.0 - rq-latest: rq - # === Integrations - Auto-generated === # These come from the populate_tox.py script. Eventually we should move all # integration tests there. diff --git a/tox.ini b/tox.ini index 9e864dd76d..c8ec198810 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # The file (and all resulting CI YAMLs) then need to be regenerated via # "scripts/generate-test-files.sh". # -# Last generated: 2025-09-19T10:59:45.339459+00:00 +# Last generated: 2025-09-19T11:39:21.755227+00:00 [tox] requires = @@ -57,13 +57,6 @@ envlist = # Requests {py3.6,py3.8,py3.12,py3.13}-requests - # RQ (Redis Queue) - {py3.6}-rq-v{0.6} - {py3.6,py3.9}-rq-v{0.13,1.0} - {py3.6,py3.11}-rq-v{1.5,1.10} - {py3.7,py3.11,py3.12}-rq-v{1.15,1.16} - {py3.7,py3.12,py3.13}-rq-latest - # === Integrations - Auto-generated === # These come from the populate_tox.py script. Eventually we should move all # integration tests there. @@ -231,6 +224,11 @@ envlist = {py3.9,py3.10}-ray-v2.7.2 {py3.9,py3.12,py3.13}-ray-v2.49.1 + {py3.6}-rq-v0.8.2 + {py3.6,py3.7}-rq-v0.13.0 + {py3.7,py3.11,py3.12}-rq-v1.16.2 + {py3.9,py3.12,py3.13}-rq-v2.6.0 + {py3.8,py3.9}-spark-v3.0.3 {py3.8,py3.10,py3.11}-spark-v3.5.6 {py3.9,py3.12,py3.13}-spark-v4.0.1 @@ -376,24 +374,6 @@ deps = # Requests requests: requests>=2.0 - # RQ (Redis Queue) - # https://github.com/jamesls/fakeredis/issues/245 - rq-v{0.6}: fakeredis<1.0 - rq-v{0.6}: redis<3.2.2 - rq-v{0.13,1.0,1.5,1.10}: fakeredis>=1.0,<1.7.4 - rq-v{1.15,1.16}: fakeredis<2.28.0 - {py3.6,py3.7}-rq-v{1.15,1.16}: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341 - rq-latest: fakeredis<2.28.0 - {py3.6,py3.7}-rq-latest: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341 - rq-v0.6: rq~=0.6.0 - rq-v0.13: rq~=0.13.0 - rq-v1.0: rq~=1.0.0 - rq-v1.5: rq~=1.5.0 - rq-v1.10: rq~=1.10.0 - rq-v1.15: rq~=1.15.0 - rq-v1.16: rq~=1.16.0 - rq-latest: rq - # === Integrations - Auto-generated === # These come from the populate_tox.py script. Eventually we should move all # integration tests there. @@ -618,6 +598,16 @@ deps = ray-v2.7.2: ray==2.7.2 ray-v2.49.1: ray==2.49.1 + rq-v0.8.2: rq==0.8.2 + rq-v0.13.0: rq==0.13.0 + rq-v1.16.2: rq==1.16.2 + rq-v2.6.0: rq==2.6.0 + rq: fakeredis<2.28.0 + rq-v0.8.2: fakeredis<1.0 + rq-v0.8.2: redis<3.2.2 + rq-v0.13.0: fakeredis>=1.0,<1.7.4 + {py3.6,py3.7}-rq: fakeredis!=2.26.0 + spark-v3.0.3: pyspark==3.0.3 spark-v3.5.6: pyspark==3.5.6 spark-v4.0.1: pyspark==4.0.1