Skip to content

Commit

Permalink
Hotfix (#8794)
Browse files Browse the repository at this point in the history
* Removed smoke_tests branch from .github/workflows/python-package.yml

* actions/checkout@v3 -> v4, actions/setup-python@v4 -> v5

* Updated requirements/extras/pytest.txt from pytest-celery==0.0.0 -> pytest-celery==1.0.0b1

* Removed duplicated memcache install in the smoke tests workers
  • Loading branch information
Nusnus committed Jan 14, 2024
1 parent 3252b69 commit ec636fa
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- '**.toml'
- "tox.ini"
pull_request:
branches: [ 'main', 'smoke_tests' ]
branches: [ 'main' ]
paths:
- '**.py'
- '**.txt'
Expand Down Expand Up @@ -144,9 +144,9 @@ jobs:
run: |
sudo apt update
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
Expand Down
5 changes: 1 addition & 4 deletions requirements/extras/pytest.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
pytest-celery==0.0.0
# pytest-celery==1.0.0a1
# git+https://github.com/celery/pytest-celery.git
# git+https://github.com/Katz-Consulting-Group/pytest-celery.git@celery_integration#egg=pytest-celery
pytest-celery==1.0.0b1
2 changes: 1 addition & 1 deletion t/smoke/workers/docker/dev
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ WORKDIR /celery
COPY --chown=test_user:test_user . /celery
RUN pip install --no-cache-dir --upgrade \
pip \
-e /celery[redis,memcache,pymemcache] \
-e /celery[redis,pymemcache] \
psutil

# The workdir must be /app
Expand Down
2 changes: 1 addition & 1 deletion t/smoke/workers/docker/pypi
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
# Install Python dependencies
RUN pip install --no-cache-dir --upgrade \
pip \
celery[redis,memcache,pymemcache]${CELERY_VERSION:+==$CELERY_VERSION} \
celery[redis,pymemcache]${CELERY_VERSION:+==$CELERY_VERSION} \
psutil

# The workdir must be /app
Expand Down

0 comments on commit ec636fa

Please sign in to comment.