Skip to content

Commit

Permalink
Merge pull request #307 from openedx/umar/unpin-celery
Browse files Browse the repository at this point in the history
Unpin celery
  • Loading branch information
mumarkhan999 authored Jul 23, 2024
2 parents 89c3836 + 3eb64c8 commit 025ddae
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 148 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version:
- "3.8"
- '3.11'
toxenv: [celery53-django42]
toxenv: [celery54-django42]

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
# Let tox control the Django version for tests
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery53.txt
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery54.txt
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
sed -i.tmp '/^amqp==/d' requirements/test.txt
Expand All @@ -87,4 +87,3 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
sed -i.tmp '/^prompt-toolkit==/d' requirements/test.txt
sed -i.tmp '/^vine==/d' requirements/test.txt
rm requirements/test.txt.tmp

2 changes: 1 addition & 1 deletion eventtracking/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""A simple event tracking library"""

__version__ = '2.4.1'
__version__ = '3.0.0'
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django
pymongo>=4.0.0,<4.4.1
pytz
six
celery<5.4.0
celery
edx-django-utils
openedx-events>=9.5.1
edx-toggles
27 changes: 8 additions & 19 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -10,15 +10,9 @@ asgiref==3.8.1
# via django
attrs==23.2.0
# via openedx-events
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# kombu
billiard==4.2.0
# via celery
celery==5.3.6
celery==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand All @@ -40,7 +34,7 @@ click-repl==0.3.0
# via celery
code-annotations==1.8.0
# via edx-toggles
django==4.2.13
django==4.2.14
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -72,15 +66,15 @@ edx-opaque-keys[django]==2.10.0
# openedx-events
edx-toggles==5.2.0
# via -r requirements/base.in
fastavro==1.9.4
fastavro==1.9.5
# via openedx-events
jinja2==3.1.4
# via code-annotations
kombu==5.3.7
# via celery
markupsafe==2.1.5
# via jinja2
newrelic==9.11.0
newrelic==9.12.0
# via edx-django-utils
openedx-events==9.11.0
# via -r requirements/base.in
Expand Down Expand Up @@ -111,7 +105,7 @@ six==1.16.0
# -r requirements/base.in
# edx-ccx-keys
# python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via django
stevedore==5.2.0
# via
Expand All @@ -121,14 +115,9 @@ stevedore==5.2.0
text-unidecode==1.3
# via python-slugify
typing-extensions==4.12.2
# via
# asgiref
# edx-opaque-keys
# kombu
# via edx-opaque-keys
tzdata==2024.1
# via
# backports-zoneinfo
# celery
# via celery
vine==5.1.0
# via
# amqp
Expand Down
2 changes: 1 addition & 1 deletion requirements/celery53.txt → requirements/celery54.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
celery==5.4.0
click==8.1.7
click-didyoumean==0.3.1
click-repl==0.3.0
Expand Down
12 changes: 4 additions & 8 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.4.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.5.4
coverage==7.6.0
# via -r requirements/ci.in
distlib==0.3.8
# via virtualenv
Expand All @@ -30,11 +30,7 @@ pluggy==1.5.0
# via tox
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.15.1
tox==4.16.0
# via -r requirements/ci.in
virtualenv==20.26.3
# via tox
88 changes: 24 additions & 64 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
alabaster==0.7.13
alabaster==0.7.16
# via sphinx
amqp==5.2.0
# via
Expand All @@ -14,7 +14,7 @@ asgiref==3.8.1
# via
# -r requirements/test.txt
# django
astroid==3.2.2
astroid==3.2.4
# via
# -r requirements/test.txt
# pylint
Expand All @@ -25,13 +25,6 @@ attrs==23.2.0
# openedx-events
babel==2.15.0
# via sphinx
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# celery
# django
# kombu
billiard==4.2.0
# via
# -r requirements/test.txt
Expand All @@ -40,15 +33,15 @@ build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.3
cachetools==5.4.0
# via
# -r requirements/ci.txt
# tox
celery==5.3.6
celery==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
certifi==2024.6.2
certifi==2024.7.4
# via requests
cffi==1.16.0
# via
Expand Down Expand Up @@ -98,7 +91,7 @@ colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.5.4
coverage[toml]==7.6.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -113,7 +106,7 @@ distlib==0.3.8
# via
# -r requirements/ci.txt
# virtualenv
django==4.2.13
django==4.2.14
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -136,7 +129,7 @@ dnspython==2.6.1
# via
# -r requirements/test.txt
# pymongo
docutils==0.20.1
docutils==0.21.2
# via sphinx
edx-ccx-keys==1.3.0
# via
Expand All @@ -147,7 +140,7 @@ edx-django-utils==5.14.2
# -r requirements/test.txt
# edx-toggles
# openedx-events
edx-lint==5.3.6
edx-lint==5.3.7
# via
# -r requirements/dev.in
# -r requirements/test.txt
Expand All @@ -158,11 +151,7 @@ edx-opaque-keys[django]==2.10.0
# openedx-events
edx-toggles==5.2.0
# via -r requirements/test.txt
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
fastavro==1.9.4
fastavro==1.9.5
# via
# -r requirements/test.txt
# openedx-events
Expand All @@ -175,12 +164,6 @@ idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/pip-tools.txt
# build
# sphinx
iniconfig==2.0.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -208,7 +191,7 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/test.txt
newrelic==9.11.0
newrelic==9.12.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -263,7 +246,7 @@ pycparser==2.22
# cffi
pygments==2.18.0
# via sphinx
pylint==3.2.4
pylint==3.2.6
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -300,7 +283,7 @@ pyproject-hooks==1.1.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.2.2
pytest==8.3.1
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -315,9 +298,7 @@ python-slugify==8.0.4
# -r requirements/test.txt
# code-annotations
pytz==2024.1
# via
# -r requirements/test.txt
# babel
# via -r requirements/test.txt
pyyaml==6.0.1
# via
# -r requirements/test.txt
Expand All @@ -332,21 +313,21 @@ six==1.16.0
# python-dateutil
snowballstemmer==2.2.0
# via sphinx
sphinx==7.1.2
sphinx==7.4.7
# via -r requirements/dev.in
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.0.6
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==1.0.8
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/test.txt
# django
Expand All @@ -360,38 +341,21 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomli==2.0.1
tomlkit==0.13.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/test.txt
# build
# coverage
# pip-tools
# pylint
# pyproject-api
# pytest
# tox
tomlkit==0.12.5
# via
# -r requirements/test.txt
# pylint
tox==4.15.1
tox==4.16.0
# via
# -r requirements/ci.txt
# -r requirements/dev.in
typing-extensions==4.12.2
# via
# -r requirements/test.txt
# asgiref
# astroid
# edx-opaque-keys
# kombu
# pylint
tzdata==2024.1
# via
# -r requirements/test.txt
# backports-zoneinfo
# celery
urllib3==2.2.2
# via requests
Expand All @@ -413,10 +377,6 @@ wheel==0.43.0
# via
# -r requirements/pip-tools.txt
# pip-tools
zipp==3.19.2
# via
# -r requirements/pip-tools.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
Loading

0 comments on commit 025ddae

Please sign in to comment.