Added django 3.2 support

druids · Dec 20, 2022 · 7756aff · 7756aff
1 parent 4df0fee
commit 7756aff
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 59 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -13,24 +13,26 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - python-version: 3.7
-            django-version: Django==2.2
+          - python-version: "3.7"
+            django-version: Django==3.1
 
-          - python-version: 3.7
-            django-version: Django==3.0
+          - python-version: "3.7"
+            django-version: Django==3.2
 
-          - python-version: 3.7
+          - python-version: "3.8"
             django-version: Django==3.1
 
-          - python-version: 3.8
-            django-version: Django==2.2
+          - python-version: "3.8"
+            django-version: Django==3.2
 
-          - python-version: 3.8
-            django-version: Django==3.0
+          - python-version: "3.9"
+            django-version: Django==3.2
 
-          - python-version: 3.8
-            django-version: Django==3.1
+          - python-version: "3.10"
+            django-version: Django==3.2
 
+          - python-version: "3.11"
+            django-version: Django==3.2
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/.travis.yml b/.travis.yml
diff --git a/django_celery_extensions/config.py b/django_celery_extensions/config.py
@@ -1,7 +1,5 @@
 from django.conf import settings as django_settings
 
-from attrdict import AttrDict
-
 from celery.beat import DEFAULT_MAX_INTERVAL
 
 
@@ -29,12 +27,7 @@ def __getattr__(self, attr):
         if attr not in DEFAULTS:
             raise AttributeError('Invalid setting: "{}"'.format(attr))
 
-        value = getattr(django_settings, 'DJANGO_CELERY_EXTENSIONS_{}'.format(attr), DEFAULTS[attr])
-
-        if isinstance(value, dict):
-            value = AttrDict(value)
-
-        return value
+        return getattr(django_settings, 'DJANGO_CELERY_EXTENSIONS_{}'.format(attr), DEFAULTS[attr])
 
 
 settings = Settings()
diff --git a/example/settings/settings.py b/example/settings/settings.py
@@ -197,3 +197,5 @@
 STATICFILES_DIRS = (
     STATICFILES_ROOT,
 )
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,7 +1,6 @@
 bumpversion==0.5.3
 coverage==5.4
 flake8==5.0.4
-pip==18.1
 coveralls==3.0.0
 sphinx==1.8.1
 sphinx_rtd_theme==0.4.3

diff --git a/setup.py b/setup.py
@@ -40,8 +40,7 @@
     install_requires=[
         'django>=2.2.14, <4.0',
         'import_string>=0.1.0',
-        'celery>=5.2, <5.3',
-        'attrdict>=2.0.0',
+        'celery>=5.2, <5.3'
     ],
     entry_points={'console_scripts': [
         'celeryautoreload=django_celery_extensions.bin.celeryautoreload:celery_autoreload',