Merge lp:~albertkol/django-openid-auth/django-4-update into lp:django-openid-auth

[Albert Kolozsvari]

Make the package Django 4-compatible.
Bump version to 0.17.

This branch pushes a new version of the package to make it Django 4 compatible.

`example_customer` was refactored to follow Django 4 standards.

Fixed broken imports like:
- `django.utils.translation import ugettext`
- `django.conf.urls import include, url`.

Signals no longer need arguments to be instantiated.

New version number: 0.17

[Daniel Manrique (roadmr)]

LGTM in general, a couple of minor comments below.

review: Approve

[Daniel Manrique (roadmr)]

+1, thanks

review: Approve

[Otto Co-Pilot (otto-copilot)]

A commit message must be set
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/107/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/108/

[Daniel Manrique (roadmr)]

i need to make some tweaks in the merge/CI configuration for this to merge properly.

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/110/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/111/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/113/

Unmerged revisions

143. By Albert Kolozsvari on 2022-08-09

Final adjustments

142. By Albert Kolozsvari on 2022-08-08

Bump version to 0.17

141. By Albert Kolozsvari on 2022-08-08

Fix tests

140. By Albert Kolozsvari on 2022-08-08

Update example_customer views

139. By Albert Kolozsvari on 2022-08-05

Make example_customer Django 4.1 friendly

138. By Albert Kolozsvari on 2022-08-05

Fix boolean error on /

137. By Albert Kolozsvari on 2022-08-05

Make running migration work

=== modified file '.bzrignore'
--- .bzrignore	2015-04-23 20:02:39 +0000
+++ .bzrignore	2022-08-09 14:17:53 +0000
@@ -2,4 +2,4 @@
 build
 dist
 db.sqlite3
-.tox
+.tox
\ No newline at end of file

=== modified file 'django_openid_auth/forms.py'
--- django_openid_auth/forms.py	2020-07-08 01:09:47 +0000
+++ django_openid_auth/forms.py	2022-08-09 14:17:53 +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/signals.py'
--- django_openid_auth/signals.py	2016-08-12 12:03:47 +0000
+++ django_openid_auth/signals.py	2022-08-09 14:17:53 +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/test_auth.py'
--- django_openid_auth/tests/test_auth.py	2020-07-09 20:05:34 +0000
+++ django_openid_auth/tests/test_auth.py	2022-08-09 14:17:53 +0000
@@ -1039,9 +1039,9 @@
         self.inject_test_models()
 
     def inject_test_models(self):
-        installed_apps = settings.INSTALLED_APPS + (
+        installed_apps = settings.INSTALLED_APPS + [
             'django_openid_auth.tests',
-        )
+        ]
         p = self.settings(INSTALLED_APPS=installed_apps)
         p.enable()
         self.addCleanup(p.disable)

=== 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	2022-08-09 14:17:53 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2013 Canonical Ltd.
+# Copyright (C) 2009-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+from django.urls import include, path
 from django.http import HttpResponse
 
 
@@ -37,6 +37,6 @@
 
 
 urlpatterns = [
-    url(r'^getuser/$', get_user),
-    url(r'^openid/', include('django_openid_auth.urls')),
+    path('getuser/', get_user),
+    path('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	2022-08-09 14:17:53 +0000
@@ -29,7 +29,7 @@
 
 from __future__ import unicode_literals
 
-from django.conf.urls import url
+from django.urls import 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'),
+    path('login/', login_begin, name='openid-login'),
+    path('complete/', login_complete, name='openid-complete'),
+    path('logo.gif', logo, name='openid-logo'),
 ]

=== modified file 'example_consumer/__init__.py'
--- example_consumer/__init__.py	2013-03-13 21:55:40 +0000
+++ example_consumer/__init__.py	2022-08-09 14:17:53 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2013 Canonical Ltd.
+# Copyright (C) 2008-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== modified file 'example_consumer/settings.py'
--- example_consumer/settings.py	2020-07-08 01:09:47 +0000
+++ example_consumer/settings.py	2022-08-09 14:17:53 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2020 Canonical Ltd.
+# Copyright (C) 2008-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -30,110 +30,137 @@
 """
 Django settings for example_consumer project.
 
+Generated by 'django-admin startproject' using Django 4.1.
+
 For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
+https://docs.djangoproject.com/en/4.1/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
+https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
-import django
+from pathlib import Path
 
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '34958734985734985734985798437'
+SECRET_KEY = "34958734985734985734985798437"
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "django_openid_auth",
+]
+
+MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+]
+
+ROOT_URLCONF = "example_consumer.urls"
+
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.contrib.auth.context_processors.auth',
-                'django.template.context_processors.debug',
-                'django.template.context_processors.i18n',
-                'django.template.context_processors.media',
-                'django.template.context_processors.static',
-                'django.template.context_processors.tz',
-                'django.contrib.messages.context_processors.messages',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
             ]
-        }
+        },
     }
 ]
 
-ALLOWED_HOSTS = []
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-# Application definition
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.messages',
-    'django.contrib.sessions',
-    'django.contrib.admin',
-    'django_openid_auth',
-)
-
-ROOT_URLCONF = 'example_consumer.urls'
-
-WSGI_APPLICATION = 'example_consumer.wsgi.application'
+WSGI_APPLICATION = "example_consumer.wsgi.application"
 
 # Database
-# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+# https://docs.djangoproject.com/en/4.1/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": f"{BASE_DIR}/db.sqlite3",
     }
 }
 
+
+# Password validation
+# https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators
+
+AUTH_PREFIX = "django.contrib.auth.password_validation"
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        "NAME": f"{AUTH_PREFIX}.UserAttributeSimilarityValidator",
+    },
+    {
+        "NAME": f"{AUTH_PREFIX}.MinimumLengthValidator",
+    },
+    {
+        "NAME": f"{AUTH_PREFIX}.CommonPasswordValidator",
+    },
+    {
+        "NAME": f"{AUTH_PREFIX}.NumericPasswordValidator",
+    },
+]
+
+
 # Internationalization
-# https://docs.djangoproject.com/en/1.7/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
+# https://docs.djangoproject.com/en/4.1/topics/i18n/
+
+LANGUAGE_CODE = "en-us"
+
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
 USE_TZ = True
 
+
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
-
-STATIC_URL = '/static/'
+# https://docs.djangoproject.com/en/4.1/howto/static-files/
+
+STATIC_URL = "static/"
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 
 # the library python-openid does not support a json session serializer
 # <openid.yadis.manager.YadisServiceManager> is not JSON serializable
 # https://github.com/openid/python-openid/issues/17
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
 
 AUTHENTICATION_BACKENDS = (
-    'django_openid_auth.auth.OpenIDBackend',
-    'django.contrib.auth.backends.ModelBackend',
+    "django_openid_auth.auth.OpenIDBackend",
+    "django.contrib.auth.backends.ModelBackend",
 )
 
 # Should users be created when new OpenIDs are used to log in?
@@ -153,11 +180,11 @@
 
 # If set, always use this as the identity URL rather than asking the
 # user.  This only makes sense if it is a server URL.
-OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
+OPENID_SSO_SERVER_URL = "https://login.launchpad.net/"
 
 # Tell django.contrib.auth to use the OpenID signin URLs.
-LOGIN_URL = '/openid/login/'
-LOGIN_REDIRECT_URL = '/'
+LOGIN_URL = "/openid/login/"
+LOGIN_REDIRECT_URL = "/"
 
 # Should django_auth_openid be used to sign into the admin interface?
 OPENID_USE_AS_ADMIN_LOGIN = False

=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2020-07-08 01:02:19 +0000
+++ example_consumer/urls.py	2022-08-09 14:17:53 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2020 Canonical Ltd.
+# Copyright (C) 2008-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,20 +27,30 @@
 # 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
+
+"""example_consumer URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/4.1/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
 from django.contrib import admin
-from django.contrib.auth import logout
-
+from django.urls import include, path
 from example_consumer import views
 
-
-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),
+    path("", views.index),
+    path("openid/", include("django_openid_auth.urls")),
+    path("logout/", views.logout_view),
+    path("private/", views.require_authentication),
+    path("admin/", admin.site.urls),
 ]
-
-urlpatterns.append(url(r'^admin/', admin.site.urls))

=== modified file 'example_consumer/views.py'
--- example_consumer/views.py	2013-03-13 21:55:40 +0000
+++ example_consumer/views.py	2022-08-09 14:17:53 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2013 Canonical Ltd.
+# Copyright (C) 2008-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,31 +27,41 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse
+
+from django.contrib.auth import logout, decorators
+from django.http import HttpResponse, HttpResponseRedirect
 from django.utils.html import escape
 
 
 def index(request):
-    s = ['<p>']
-    if request.user.is_authenticated():
-        s.append('You are signed in as <strong>%s</strong> (%s)' % (
-                escape(request.user.username),
-                escape(request.user.get_full_name())))
+    s = ["<p>"]
+    s.append('<a href="/admin">Go to admin</a>')
+    s.append("</p>")
+
+    s.append("<p>")
+    if request.user.is_authenticated:
+        user_name = escape(request.user.username)
+        full_name = escape(request.user.get_full_name())
+
+        s.append(
+            f"You are signed in as <strong>{user_name}</strong> ({full_name})"
+        )
         s.append(' | <a href="/logout">Sign out</a>')
     else:
         s.append('<a href="/openid/login">Sign in with OpenID</a>')
-
-    s.append('</p>')
+    s.append("</p>")
 
     s.append('<p><a href="/private">This requires authentication</a></p>')
-    return HttpResponse('\n'.join(s))
-
-
-def next_works(request):
-    return HttpResponse('?next= bit works. <a href="/">Home</a>')
-
-
-@login_required
+
+    return HttpResponse("\n".join(s))
+
+
[e-mail]_required
 def require_authentication(request):
-    return HttpResponse('This page requires authentication')
+    return HttpResponse("This page requires authentication")
+
+
+def logout_view(request):
+    logout(request)
+
+    return HttpResponseRedirect("/")

=== modified file 'example_consumer/wsgi.py'
--- example_consumer/wsgi.py	2015-04-23 20:02:39 +0000
+++ example_consumer/wsgi.py	2022-08-09 14:17:53 +0000
@@ -1,14 +1,46 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2007 Simon Willison
+# Copyright (C) 2008-2022 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
 """
-WSGI config for demo project.
+WSGI config for example_consumer project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/4.1/howto/deployment/wsgi/
 """
 
 import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
 
 from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example_consumer.settings")
+
 application = get_wsgi_application()

=== modified file 'setup.py'
--- setup.py	2020-08-14 19:44:58 +0000
+++ setup.py	2022-08-09 14:17:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2020 Canonical Ltd.
+# Copyright (C) 2009-2022 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -26,6 +26,8 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+
+
 """OpenID integration for django.contrib.auth
 
 A library that can be used to add OpenID support to Django applications.
@@ -40,43 +42,42 @@
     info.
 """
 
-import sys
 
 from setuptools import find_packages, setup
 
-description, long_description = __doc__.split('\n\n', 1)
-VERSION = '0.16'
+description, long_description = __doc__.split("\n\n", 1)
+VERSION = "0.17"
 
-install_requires = ['django>=2.2', 'python3-openid']
+install_requires = ["django>=2.2", "python3-openid"]
 
 setup(
-    name='django-openid-auth',
+    name="django-openid-auth",
     version=VERSION,
-
     packages=find_packages(),
     install_requires=install_requires,
     package_data={
-        'django_openid_auth': ['templates/openid/*.html'],
+        "django_openid_auth": ["templates/openid/*.html"],
     },
-
     # metadata for upload to PyPI
-    author='Canonical Ltd',
-    author_email='[e-mail]',
+    author="Canonical Ltd",
+    author_email="[e-mail]",
     description=description,
     long_description=long_description,
-    license='BSD',
-    platforms=['any'],
-    url='https://launchpad.net/django-openid-auth',
-    download_url=('http://launchpad.net/django-openid-auth/trunk/%s/+download'
-                  '/django-openid-auth-%s.tar.gz' % (VERSION, VERSION)),
+    license="BSD",
+    platforms=["any"],
+    url="https://launchpad.net/django-openid-auth",
+    download_url=(
+        f"http://launchpad.net/django-openid-auth/trunk/{VERSION}/+download"
+        f"/django-openid-auth-{VERSION}.tar.gz"
+    ),
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Web Environment',
-        'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules'
-        ],
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Web Environment",
+        "Framework :: Django",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
 )