update supported versions and prepare release (#233)

Author: merwok

.circleci/config.yml

@@ -7,8 +7,8 @@ workflows:
           name: test-py<< matrix.python >>-dj<< matrix.django >>
           matrix:
             parameters:
-              python: ["3.10", "3.9"]
-              django: ["4.1", "4.0", "3.2"]
+              python: ["3.12", "3.11", "3.10"]
+              django: ["4.2", "4.1", "3.2"]
       - check
 
 jobs:
@@ -21,7 +21,7 @@ jobs:
         type: string
     docker:
       - image: cimg/python:<< parameters.python >>
-      - image: cimg/postgres:14.0
+      - image: cimg/postgres:15.5
         environment:
           POSTGRES_DB: circle_test
           POSTGRES_USER: testapp
@@ -50,8 +50,8 @@ jobs:
       - when:
           condition:
             and:
-              - equal: [<< parameters.python >>, "3.10"]
-              - equal: [<< parameters.django >>, "4.0"]
+              - equal: [<< parameters.python >>, "3.12"]
+              - equal: [<< parameters.django >>, "4.2"]
           steps:
             - run:
                 name: Check coverage with Python << parameters.python >>
@@ -66,12 +66,12 @@ jobs:
 
   check:
     docker:
-      - image: cimg/python:3.10
+      - image: cimg/python:3.12
     working_directory: ~/rest-auth-toolkit
     steps:
       - checkout
       - restore_cache:
-          key: check-v2
+          key: check-v3
       - run:
           name: Install CI tools
           command: |
@@ -81,7 +81,7 @@ jobs:
           name: Check packaging and dependencies
           command: venv/bin/tox -e pkg
       - save_cache:
-          key: check-v2
+          key: check-v3
           paths:
             - venv
             - .tox

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog for Rest-Framework-Auth-Toolkit
 
-## v0.13 (unreleased)
+## v0.13
+
+Tested with Python 3.10, 3.11 and 3.12,
+and Django 3.2, 4.1 and 4.2.
 
 
 ## v0.12

README.md

@@ -34,9 +34,13 @@ See the [changelog](CHANGELOG.md) for breaking changes.
 To run tests:
 
 ```
-export DATABASE_URL=postgres://ratk@localhost:5432/ratk
+export DATABASE_URL=postgres://ratk:ktar@localhost:5432/ratk
 tox
 ```
 
-You will have to create the `ratk` role first, as well as
-the `ratk` and `test_ratk` databases.
+You will have to create the `ratk` role first, for example using psql:
+
+```
+create role ratk login createdb;
+alter role rath with password encrypted 'ktar';
+```

demo/README.md

@@ -24,20 +24,27 @@ cd demo
 pip install -r requirements.txt
 ```
 
+Finally, you'll need to create the database (only once), for example
+using psql:
+
+```
+create database ratk with owner ratk;
+```
+
 # How to run
 
 Define the environment variables needed by the app:
 
 ```
-export DATABASE_URL=postgres://restauth@localhost:5432/demo
+export DATABASE_URL=postgres://restauth:password@localhost:5432/demo
 export DEMO_FACEBOOK_APP_ID="..."
 export DEMO_FACEBOOK_APP_SECRET_KEY="..."
 ```
 
 (using a [virtualenvwrapper hook](https://virtualenvwrapper.readthedocs.io/en/latest/scripts.html#postactivate)
 or a `.env` file with [direnv](https://direnv.net/) is a good ideae to make this automatic)
 
-You can then run Django commands (from the `demo` directory):
+You can then run Django commands (still inside the `demo` directory):
 
 ```
 python manage.py migrate

demo/demo/accounts/migrations/0006_alter_emailconfirmation_external_id.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-02-26 00:33
+
+from django.db import migrations
+import shortuuid.django_fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("accounts", "0005_auto_20210511_1956"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="emailconfirmation",
+            name="external_id",
+            field=shortuuid.django_fields.ShortUUIDField(
+                alphabet=None, length=22, max_length=22, prefix=""
+            ),
+        ),
+    ]

demo/demo/accounts/models.py

@@ -4,7 +4,7 @@
 
 from model_utils.fields import AutoCreatedField
 from model_utils.models import TimeStampedModel
-from shortuuidfield import ShortUUIDField
+from shortuuid.django_fields import ShortUUIDField
 
 from rest_auth_toolkit.managers import BaseEmailUserManager
 from rest_auth_toolkit.models import BaseEmailUser, BaseAPIToken, BaseEmailConfirmation

demo/requirements.in

@@ -1,23 +1,24 @@
 flit
-pip-tools == 6.10.*
+pip-tools == 7.4.*
 
-django == 4.0.*
+django == 4.2.*
 djangorestframework
 django-debug-toolbar
 dj-database-url
 psycopg2
 
 django-model-utils
-django-shortuuidfield
+shortuuid
 
-# TODO add editable install for rest-framework-auth-toolkit
-# (when supported by pip and pip-compile); see README for how to install rest-auth-toolkit
-#-e ..[facebook]
-# In the meantime we include facepy here to make sure requirements.txt
+# we can't add "-e ..[facebook]" here in a way that works correctly in the
+# pinned requirements file, so we include facepy to make sure requirements.txt
 # contains all transitive dependencies
 facepy
 
 # API docs
 coreapi
 markdown
 pygments
+
+# old dependency retained to keep migrations working
+django-shortuuidfield

demo/requirements.txt

@@ -1,47 +1,46 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile --annotation-style=line requirements.in
 #
-asgiref==3.5.2            # via django
-build==0.9.0              # via pip-tools
-certifi==2022.9.24        # via requests
-charset-normalizer==2.1.1  # via requests
-click==8.1.3              # via pip-tools
+asgiref==3.7.2            # via django
+build==1.0.3              # via pip-tools
+certifi==2024.2.2         # via requests
+charset-normalizer==3.3.2  # via requests
+click==8.1.7              # via pip-tools
 coreapi==2.3.3            # via -r requirements.in
 coreschema==0.0.4         # via coreapi
-dj-database-url==1.0.0    # via -r requirements.in
-django==4.0.8             # via -r requirements.in, dj-database-url, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
-django-debug-toolbar==3.7.0  # via -r requirements.in
-django-model-utils==4.3.1  # via -r requirements.in
+dj-database-url==2.1.0    # via -r requirements.in
+django==4.2.10            # via -r requirements.in, dj-database-url, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
+django-debug-toolbar==4.3.0  # via -r requirements.in
+django-model-utils==4.4.0  # via -r requirements.in
 django-shortuuidfield==0.1.3  # via -r requirements.in
 djangorestframework==3.14.0  # via -r requirements.in
-docutils==0.19            # via flit
+docutils==0.20.1          # via flit
 facepy==1.0.12            # via -r requirements.in
-flit==3.8.0               # via -r requirements.in
-flit-core==3.8.0          # via flit
-idna==3.4                 # via requests
+flit==3.9.0               # via -r requirements.in
+flit-core==3.9.0          # via flit
+idna==3.6                 # via requests
 itypes==1.2.0             # via coreapi
-jinja2==3.1.2             # via coreschema
-markdown==3.4.1           # via -r requirements.in
-markupsafe==2.1.1         # via jinja2
-packaging==21.3           # via build
-pep517==0.13.0            # via build
-pip-tools==6.10.0         # via -r requirements.in
-psycopg2==2.9.5           # via -r requirements.in
-pygments==2.13.0          # via -r requirements.in
-pyparsing==3.0.9          # via packaging
-pytz==2022.6              # via djangorestframework
-requests==2.28.1          # via coreapi, facepy, flit
-shortuuid==1.0.11         # via django-shortuuidfield
+jinja2==3.1.3             # via coreschema
+markdown==3.5.2           # via -r requirements.in
+markupsafe==2.1.5         # via jinja2
+packaging==23.2           # via build
+pip-tools==7.4.0          # via -r requirements.in
+psycopg2==2.9.9           # via -r requirements.in
+pygments==2.17.2          # via -r requirements.in
+pyproject-hooks==1.0.0    # via build, pip-tools
+pytz==2024.1              # via djangorestframework
+requests==2.31.0          # via coreapi, facepy, flit
+shortuuid==1.0.11         # via -r requirements.in, django-shortuuidfield
 six==1.16.0               # via django-shortuuidfield, facepy
-sqlparse==0.4.3           # via django, django-debug-toolbar
-tomli==2.0.1              # via build, pep517
+sqlparse==0.4.4           # via django, django-debug-toolbar
 tomli-w==1.0.0            # via flit
+typing-extensions==4.9.0  # via dj-database-url
 uritemplate==4.1.1        # via coreapi
-urllib3==1.26.12          # via requests
-wheel==0.38.4             # via pip-tools
+urllib3==2.2.1            # via requests
+wheel==0.42.0             # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

pyproject.toml

@@ -1,29 +1,30 @@
 [build-system]
-requires = ["flit_core == 3.4.*"]
+requires = ["flit_core == 3.9.*"]
 build-backend = "flit_core.buildapi"
 
 [project]
 dynamic = ["version", "description"]
 name = "Rest_Framework_Auth_Toolkit"
 authors = [ { name = "Caravan Coop", email = "[email protected]" } ]
 readme = "README.md"
-requires-python = ">= 3.8"
+requires-python = ">= 3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Environment :: Web Environment",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Framework :: Django",
     "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",
+    "Framework :: Django :: 4.2",
 ]
 dependencies = [
-    "django >= 2.2",
+    "django >= 3.2",
 ]
 
 [project.optional-dependencies]

rest_auth_toolkit/__init__.py

@@ -1,3 +1,3 @@
 """Simple + flexible signup and login for Django APIs"""
 
-__version__ = '0.13.dev0'
+__version__ = '0.13'

rest_auth_toolkit/models.py

@@ -1,12 +1,11 @@
 import os
 import binascii
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.dispatch import Signal
-from django.utils.timezone import utc
 from django.utils.translation import gettext_lazy as _
 
 from .managers import BaseEmailUserManager, BaseAPITokenManager
@@ -71,7 +70,7 @@ def confirm(self):
         The time period to confirm an email is configured with the setting
         email_confirmation_validity_period, which defaults to 60 minutes.
         """
-        now = datetime.now(utc)
+        now = datetime.now(timezone.utc)
         delay = (now - self.created).total_seconds()
         validity = get_setting('email_confirmation_validity_period', 60) * 60
 

tests/conftest.py

@@ -0,0 +1 @@
+pytest_plugins = ["python_path"]

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{310,39}-dj{4.1,4.0,3.2}
+envlist = py{312,311,310}-dj{4.2,4.1,3.2}
 minversion = 3.4.0
 isolated_build = True
 
@@ -10,9 +10,9 @@ deps =
     -r requirements-test.txt
     -r demo/requirements.txt
 commands =
-    py{310,39}-dj3.2: pip install django==3.2.*
-    py{310,39}-dj4.0: pip install django==4.0.*
-    py{310,39}-dj4.1: pip install django==4.1.*
+    py{312,311,310}-dj3.2: pip install django==3.2.*
+    py{312,311,310}-dj4.1: pip install django==4.1.*
+    py{312,311,310}-dj4.2: pip install django==4.2.*
     flake8 rest_auth_toolkit tests demo
     pytest {posargs}
 
@@ -39,7 +39,6 @@ commands =
 env =
     RAT_TESTING=1
     DJANGO_SETTINGS_MODULE=demo.settings
-plugins = python_path
 addopts = -svv --showlocals --reuse-db
 pythonpath = demo
 testpaths = tests/unit tests/functional