diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 2006ae55..078adb68 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -56,7 +56,7 @@ jobs: working-directory: examples run: | python -m pip install --upgrade pip pytest-cov - pip install -U "pytest-celery[all]@git+https://github.com/celery/pytest-celery.git" + pip install -e "..[all]" - name: Run tests working-directory: examples @@ -90,6 +90,7 @@ jobs: working-directory: examples/myworker run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests @@ -124,6 +125,7 @@ jobs: working-directory: examples/range run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests @@ -158,6 +160,7 @@ jobs: working-directory: examples/rabbitmq_management run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests @@ -192,6 +195,7 @@ jobs: working-directory: examples/django run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run Migrations @@ -232,6 +236,7 @@ jobs: working-directory: examples/myutils run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests @@ -266,6 +271,7 @@ jobs: working-directory: examples/worker_pool run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests @@ -300,13 +306,17 @@ jobs: working-directory: examples/hybrid_setup run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests - working-directory: examples/hybrid_setup - timeout-minutes: 10 - run: | - pytest -xsv tests --reruns 5 --reruns-delay 10 + uses: nick-fields/retry@v3 + with: + timeout_minutes: 10 + max_attempts: 5 + retry_wait_seconds: 0 + command: | + cd examples/hybrid_setup && pytest -xsv tests --reruns 5 --reruns-delay 10 vhost: runs-on: ${{ matrix.os }} @@ -334,6 +344,7 @@ jobs: working-directory: examples/vhost run: | python -m pip install --upgrade pip + pip install -e "../..[all]" pip install -r requirements.txt - name: Run tests diff --git a/examples/django/requirements.txt b/examples/django/requirements.txt index b5c1b713..39677140 100644 --- a/examples/django/requirements.txt +++ b/examples/django/requirements.txt @@ -3,4 +3,5 @@ django>=2.2.1 pytest-django>=4.7.0 pytest-xdist>=3.5.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git +celery[redis] +psutil diff --git a/examples/hybrid_setup/requirements.txt b/examples/hybrid_setup/requirements.txt index a5118b6a..bf05606f 100644 --- a/examples/hybrid_setup/requirements.txt +++ b/examples/hybrid_setup/requirements.txt @@ -3,4 +3,3 @@ pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 pytest-rerunfailures>=14.0 celery[gevent] -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/myutils/requirements.txt b/examples/myutils/requirements.txt index f31534b7..084dd07f 100644 --- a/examples/myutils/requirements.txt +++ b/examples/myutils/requirements.txt @@ -1,4 +1,3 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/myworker/requirements.txt b/examples/myworker/requirements.txt index f31534b7..f002cdc5 100644 --- a/examples/myworker/requirements.txt +++ b/examples/myworker/requirements.txt @@ -1,4 +1,5 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git +celery[redis] +psutil diff --git a/examples/rabbitmq_management/requirements.txt b/examples/rabbitmq_management/requirements.txt index f31534b7..084dd07f 100644 --- a/examples/rabbitmq_management/requirements.txt +++ b/examples/rabbitmq_management/requirements.txt @@ -1,4 +1,3 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/range/requirements.txt b/examples/range/requirements.txt index 4e1b78fa..db498482 100644 --- a/examples/range/requirements.txt +++ b/examples/range/requirements.txt @@ -2,4 +2,3 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/vhost/requirements.txt b/examples/vhost/requirements.txt index f31534b7..084dd07f 100644 --- a/examples/vhost/requirements.txt +++ b/examples/vhost/requirements.txt @@ -1,4 +1,3 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-rerunfailures>=14.0 -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/worker_pool/requirements.txt b/examples/worker_pool/requirements.txt index a5118b6a..69073671 100644 --- a/examples/worker_pool/requirements.txt +++ b/examples/worker_pool/requirements.txt @@ -2,5 +2,6 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 pytest-rerunfailures>=14.0 -celery[gevent] -pytest-celery[all]@git+https://github.com/celery/pytest-celery.git +celery[redis,gevent] +psutil +requests