Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Added support for django42 #234

Merged
merged 3 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ jobs:
python-version: ["3.8"]
toxenv:
[
celery44-django32,
celery52-django32,
celery44-django40,
celery52-django40,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep celery44-django32 and celery52-django32 as we currently have these versions in our edX services.

celery53-django32,
celery53-django42,
]

steps:
Expand Down
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.1.0'
__version__ = '2.2.0'
1 change: 0 additions & 1 deletion eventtracking/django/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
"""
from .django_tracker import DjangoTracker

default_app_config = 'eventtracking.django.apps.EventTrackingConfig'
5 changes: 3 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ django==3.2.20
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via edx-django-utils
edx-django-utils==5.6.0
# via -r requirements/base.in
kombu==5.3.1
# via celery
newrelic==8.8.1
newrelic==8.9.0
# via edx-django-utils
pbr==5.11.1
# via stevedore
Expand Down
9 changes: 9 additions & 0 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
amqp==5.1.1
billiard==4.1.0
celery==5.3.1
click==8.1.6
click-didyoumean==0.3.0
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.39
vine==5.0.0
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filelock==3.12.2
# virtualenv
packaging==23.1
# via tox
platformdirs==3.9.1
platformdirs==3.10.0
# via virtualenv
pluggy==1.2.0
# via tox
Expand Down
15 changes: 8 additions & 7 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,13 @@ django==3.2.20
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -162,7 +163,7 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/test.txt
newrelic==8.8.1
newrelic==8.9.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -183,7 +184,7 @@ pip-tools==7.1.0
# via
# -r requirements/dev.in
# -r requirements/pip-tools.txt
platformdirs==3.9.1
platformdirs==3.10.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -207,7 +208,7 @@ py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.10.0
pycodestyle==2.11.0
# via
# -r requirements/dev.in
# -r requirements/test.txt
Expand All @@ -217,7 +218,7 @@ pycparser==2.21
# cffi
pygments==2.15.1
# via sphinx
pylint==2.17.4
pylint==2.17.5
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -281,7 +282,7 @@ six==1.16.0
# tox
snowballstemmer==2.2.0
# via sphinx
sphinx==7.1.0
sphinx==7.1.1
# via -r requirements/dev.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
Expand Down Expand Up @@ -320,7 +321,7 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tomlkit==0.11.8
tomlkit==0.12.1
# via
# -r requirements/test.txt
# pylint
Expand Down
1 change: 1 addition & 0 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tomli==2.0.1
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.41.0
# via pip-tools

Expand Down
13 changes: 7 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,13 @@ dill==0.3.7
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -96,7 +97,7 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/test.in
newrelic==8.8.1
newrelic==8.9.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -106,7 +107,7 @@ pbr==5.11.1
# via
# -r requirements/base.txt
# stevedore
platformdirs==3.9.1
platformdirs==3.10.0
# via pylint
pluggy==1.2.0
# via pytest
Expand All @@ -117,13 +118,13 @@ psutil==5.9.5
# via
# -r requirements/base.txt
# edx-django-utils
pycodestyle==2.10.0
pycodestyle==2.11.0
# via -r requirements/test.in
pycparser==2.21
# via
# -r requirements/base.txt
# cffi
pylint==2.17.4
pylint==2.17.5
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -180,7 +181,7 @@ tomli==2.0.1
# coverage
# pylint
# pytest
tomlkit==0.11.8
tomlkit==0.12.1
# via pylint
typing-extensions==4.7.1
# via
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
[tox]
envlist = py38-celery{44,52}-django{32,40}
envlist = py38-celery{53}-django{32,42}

[testenv]
setenv =
DJANGO_SETTINGS_MODULE = eventtracking.django.tests.settings
PYTHONPATH = {toxinidir}
deps =
celery44: -r{toxinidir}/requirements/celery44.txt
celery52: -r{toxinidir}/requirements/celery52.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep these for now

celery53: -r{toxinidir}/requirements/celery53.txt
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =

Expand Down