Merge pull request #634 from CTPUG/feature/add_support_for_django3.2

Feature/add support for django3.2
CTPUG · Jun 4, 2022 · 1d84319 · 1d84319
2 parents 49b62c4 + 536c8e5
commit 1d84319
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -22,7 +22,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
 
-    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' ||  matrix.django-version == '3.2.0' ||  matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
+    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
     strategy:
       max-parallel: 4
       matrix:
@@ -46,7 +46,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt -r requirements-dev.txt
@@ -70,7 +70,7 @@ jobs:
         pip install 'https://github.com/django/django/archive/main.tar.gz'
       if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
       env:
         TESTDB: postgres
       run: |
@@ -80,7 +80,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '3.1.0' ||  matrix.django-version == '3.2.0' ||  matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
+    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
     strategy:
       max-parallel: 4
       matrix:
@@ -104,7 +104,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt -r requirements-dev.txt
@@ -118,7 +118,7 @@ jobs:
         pip install 'https://github.com/django/django/archive/main.tar.gz'
       if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '3.1.0' || matrix.django-version == '3.2.0' || matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
       run: |
         NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test
 

diff --git a/README.rst b/README.rst
@@ -35,7 +35,7 @@ Available on `readthedocs.org`_.
 Supported Django versions
 =========================
 
-Wafer supports Django 2+ and Django 3.0.
+Wafer supports Django 2.2 and Django 3.0 - 3.2.
 
 Installation
 ============

diff --git a/docs/install.rst b/docs/install.rst
@@ -5,7 +5,7 @@ Installation
 Supported versions
 ==================
 
-Wafer supports Django 2.0-3.0 and Python 3.6 onwards.
+Wafer supports Django 2.2, 3.0-3.2 and Python 3.6 to 3.9.
 
 Requirements
 ============

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages, setup
 
 REQUIRES = [
-    'Django>=2.2,<3.1',
+    'Django>=2.2,<4',
     'bleach',
     'bleach-allowlist',
     'diff-match-patch',

diff --git a/wafer/registration/apps.py b/wafer/registration/apps.py
@@ -4,5 +4,5 @@
 
 
 class RegistrationConfig(AppConfig):
-    label = 'wafer.registration'
+    label = 'wafer_registration'
     name = 'wafer.registration'