Skip to content

Commit

Permalink
feat!: Support Django 4.1
Browse files Browse the repository at this point in the history
Added support for Django 4.1. We respect Django's currently supported versions, so the project now supports Django 3.2 and 4.
  • Loading branch information
cdriehuys committed Mar 24, 2023
2 parents 6e28c9c + adc37a1 commit ea261d0
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 27 deletions.
39 changes: 25 additions & 14 deletions .github/workflows/review-build.yml
Expand Up @@ -14,24 +14,35 @@ jobs:
test:
name: Test

runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
django-version:
- '>= 2.2, < 2.3'
- '>= 3.0, < 3.1'
- '>= 3.1, < 3.2'
python-version:
- "3.6"
- "3.7"
- "3.8"
- "3.9"
include:
# Django 3.2
- django-version: '>= 3.2, < 3.3'
python-version: "3.6"
- django-version: '>= 3.2, < 3.3'
python-version: "3.7"
- django-version: '>= 3.2, < 3.3'
python-version: "3.8"
- django-version: '>= 3.2, < 3.3'
python-version: "3.9"
- django-version: '>= 3.2, < 3.3'
python-version: "3.10"

# Django 4.0 - 4.1
- django-version: '>= 4.0, < 4.2'
python-version: "3.8"
- django-version: '>= 4.0, < 4.2'
python-version: "3.9"
- django-version: '>= 4.0, < 4.2'
python-version: "3.10"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4.5.0
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -68,10 +79,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4.5.0
with:
python-version: "3.9"

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -38,8 +38,8 @@ Compatibility
*************

| **Python:** 3.6 or later
| **Django:** Versions 2.2 through 3.1
| **Django REST Framework:** 3.10 or later
| **Django:** Versions 3.2 through 4.1
| **Django REST Framework:** 3.14 or later
***************
Adding Features
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.rst
Expand Up @@ -6,6 +6,8 @@ In Development

Features
* :issue:`96`: Ability to customize email subjects.
* :issue:`97`: Added support for Django 4. We explicitly test against Django
3.2, 4.0, and 4.1, but all versions after 3.2 should work.

v3.0.3
------
Expand Down
2 changes: 1 addition & 1 deletion rest_email_auth/admin.py
Expand Up @@ -3,7 +3,7 @@

from django.contrib import admin
from django.contrib.auth import get_user_model
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from rest_email_auth import models

Expand Down
2 changes: 1 addition & 1 deletion rest_email_auth/app_settings.py
Expand Up @@ -7,7 +7,7 @@

import sys

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class AppSettings(object):
Expand Down
2 changes: 1 addition & 1 deletion rest_email_auth/models.py
Expand Up @@ -6,7 +6,7 @@
from django.db import models, transaction
from django.utils import timezone
from django.utils.crypto import get_random_string
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

import email_utils

Expand Down
2 changes: 1 addition & 1 deletion rest_email_auth/serializers.py
Expand Up @@ -7,7 +7,7 @@
import logging

from django.contrib.auth import get_user_model, password_validation
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from rest_framework import serializers

Expand Down
4 changes: 2 additions & 2 deletions rest_email_auth/signals.py
Expand Up @@ -8,6 +8,6 @@
from django import dispatch


email_verified = dispatch.Signal(providing_args=["email"])
email_verified = dispatch.Signal()

user_registered = dispatch.Signal(providing_args=["user"])
user_registered = dispatch.Signal()
10 changes: 5 additions & 5 deletions setup.py
Expand Up @@ -21,9 +21,9 @@ def get_description():
"Development Status :: 5 - Production/Stable",
# Supported versions of Django
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
Expand All @@ -38,9 +38,9 @@ def get_description():
packages=find_packages(),
# Dependencies
install_requires=[
"Django >= 2.2, < 3.2",
"Django >= 3.2, <= 4.2",
"django-email-utils >= 1.0, < 2.0",
# DRF 3.10 is the first to support our minimum Django version of 2.2.
"djangorestframework >= 3.10",
"djangorestframework >= 3.14",
],
)

0 comments on commit ea261d0

Please sign in to comment.