fix: Added support for django42 (#234)

* fix: Added support for django42 * fix: trailing space removed * fix: apply changes requested by sobhan
openedx · Aug 1, 2023 · 7ec8b3c · 7ec8b3c
1 parent d7a2ac6
commit 7ec8b3c
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,8 +17,8 @@ jobs:
           [
             celery44-django32,
             celery52-django32,
-            celery44-django40,
-            celery52-django40,
+            celery53-django32,
+            celery53-django42,
           ]
 
     steps:

diff --git a/eventtracking/__init__.py b/eventtracking/__init__.py
@@ -1,3 +1,3 @@
 """A simple event tracking library"""
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'
diff --git a/eventtracking/django/__init__.py b/eventtracking/django/__init__.py
@@ -2,5 +2,3 @@
 Event tracking django app.
 """
 from .django_tracker import DjangoTracker
-
-default_app_config = 'eventtracking.django.apps.EventTrackingConfig'
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -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

diff --git a/requirements/celery53.txt b/requirements/celery53.txt
@@ -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
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -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

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -18,6 +18,7 @@ tomli==2.0.1
     # via
     #   build
     #   pip-tools
+    #   pyproject-hooks
 wheel==0.41.0
     # via pip-tools
 

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-celery{44,52}-django{32,40}
+envlist = py38-celery{53}-django{32,42}
 
 [testenv]
 setenv = 
@@ -8,8 +8,9 @@ setenv =
 deps = 
     celery44: -r{toxinidir}/requirements/celery44.txt
     celery52: -r{toxinidir}/requirements/celery52.txt
+    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 =