Merge lp:~shanepelletier/django-openid-auth/upgrade-to-django-3.2 into lp:django-openid-auth

[Shane M. Pelletier]

Upgrade to Django>=3.2

[Maximiliano Bertacchini (maxiberta)]

LGTM, thanks!

review: Approve

=== modified file 'django_openid_auth/forms.py'
--- django_openid_auth/forms.py	2020-07-08 01:09:47 +0000
+++ django_openid_auth/forms.py	2023-08-01 17:48:31 +0000
@@ -33,7 +33,7 @@
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.forms import UserChangeForm
 from django.contrib.auth.models import Group
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.conf import settings
 
 from openid.yadis import xri

=== modified file 'django_openid_auth/models.py'
--- django_openid_auth/models.py	2020-07-07 22:57:21 +0000
+++ django_openid_auth/models.py	2023-08-01 17:48:31 +0000
@@ -35,6 +35,7 @@
 
 
 class Nonce(models.Model):
+    id = models.AutoField(primary_key=True)
     server_url = models.CharField(max_length=2047)
     timestamp = models.IntegerField()
     salt = models.CharField(max_length=40)
@@ -44,6 +45,8 @@
 
 
 class Association(models.Model):
+    id = models.AutoField(primary_key=True)
+
     server_url = models.TextField(max_length=2047)
     handle = models.CharField(max_length=255)
     secret = models.TextField(max_length=255)  # Stored base64 encoded
@@ -56,6 +59,7 @@
 
 
 class UserOpenID(models.Model):
+    id = models.AutoField(primary_key=True)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     claimed_id = models.TextField(max_length=2047, unique=True)
     display_id = models.TextField(max_length=2047)

=== modified file 'django_openid_auth/signals.py'
--- django_openid_auth/signals.py	2016-08-12 12:03:47 +0000
+++ django_openid_auth/signals.py	2023-08-01 17:48:31 +0000
@@ -32,6 +32,5 @@
 import django.dispatch
 
 
-openid_login_complete = django.dispatch.Signal(providing_args=[
-    'request', 'openid_response'])
-openid_duplicate_username = django.dispatch.Signal(providing_args=['username'])
+openid_login_complete = django.dispatch.Signal()
+openid_duplicate_username = django.dispatch.Signal()

=== modified file 'django_openid_auth/tests/urls.py'
--- django_openid_auth/tests/urls.py	2017-01-16 12:22:28 +0000
+++ django_openid_auth/tests/urls.py	2023-08-01 17:48:31 +0000
@@ -28,7 +28,7 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.http import HttpResponse
 
 
@@ -37,6 +37,6 @@
 
 
 urlpatterns = [
-    url(r'^getuser/$', get_user),
-    url(r'^openid/', include('django_openid_auth.urls')),
+    re_path(r'^getuser/$', get_user),
+    re_path(r'^openid/', include('django_openid_auth.urls')),
 ]

=== modified file 'django_openid_auth/urls.py'
--- django_openid_auth/urls.py	2017-01-16 12:22:28 +0000
+++ django_openid_auth/urls.py	2023-08-01 17:48:31 +0000
@@ -29,7 +29,7 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from django_openid_auth.views import (
     login_begin,
@@ -39,7 +39,7 @@
 
 
 urlpatterns = [
-    url(r'^login/$', login_begin, name='openid-login'),
-    url(r'^complete/$', login_complete, name='openid-complete'),
-    url(r'^logo.gif$', logo, name='openid-logo'),
+    re_path(r'^login/$', login_begin, name='openid-login'),
+    re_path(r'^complete/$', login_complete, name='openid-complete'),
+    re_path(r'^logo.gif$', logo, name='openid-logo'),
 ]

=== modified file 'example_consumer/settings.py'
--- example_consumer/settings.py	2020-07-08 01:09:47 +0000
+++ example_consumer/settings.py	2023-08-01 17:48:31 +0000
@@ -65,6 +65,7 @@
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.media',
+                'django.template.context_processors.request',
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',

=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2020-07-08 01:02:19 +0000
+++ example_consumer/urls.py	2023-08-01 17:48:31 +0000
@@ -27,7 +27,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
 from django.contrib.auth import logout
 
@@ -37,10 +37,10 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^$', views.index),
-    url(r'^openid/', include('django_openid_auth.urls')),
-    url(r'^logout/$', logout),
-    url(r'^private/$', views.require_authentication),
+    re_path(r'^$', views.index),
+    re_path(r'^openid/', include('django_openid_auth.urls')),
+    re_path(r'^logout/$', logout),
+    re_path(r'^private/$', views.require_authentication),
 ]
 
-urlpatterns.append(url(r'^admin/', admin.site.urls))
+urlpatterns.append(re_path(r'^admin/', admin.site.urls))

=== modified file 'setup.py'
--- setup.py	2020-08-14 19:44:58 +0000
+++ setup.py	2023-08-01 17:48:31 +0000
@@ -45,9 +45,9 @@
 from setuptools import find_packages, setup
 
 description, long_description = __doc__.split('\n\n', 1)
-VERSION = '0.16'
+VERSION = '0.17'
 
-install_requires = ['django>=2.2', 'python3-openid']
+install_requires = ['django>=3.2', 'python3-openid']
 
 setup(
     name='django-openid-auth',

=== modified file 'tox.ini'
--- tox.ini	2020-07-13 15:54:36 +0000
+++ tox.ini	2023-08-01 17:48:31 +0000
@@ -12,22 +12,12 @@
 
 [tox]
 envlist =
-    py3-django2.2
-# sdist crashes without `deps`.
-skipsdist = true
-
-[testenv:py3-django2.2]
-basepython = python3
-commands =
-    pip install --upgrade pip
-    pip install mock python3-openid django==2.2.14
-    python manage.py test django_openid_auth
-
-[testenv:py3-django3.0]
-# Django 3 requires python 3.6 which we don't have on ancient xenial.
-# Once the mergebot machine is updated we can change this.
-basepython = python3
-commands =
-    pip install --upgrade pip
-    pip install mock python3-openid django==3.0.8
-    python manage.py test django_openid_auth
+    py36, py37, py38, py39
+
+[testenv]
+commands =
+    python manage.py test django_openid_auth
+deps =
+    mock
+    python3-openid
+    django>=3.2
\ No newline at end of file