Upgrade Django, pin docker Python version, and adjust assertion.

unt-libraries · Sep 14, 2023 · 4edecae · 4edecae
1 parent d7f9be9
commit 4edecae
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@ Change Log
 ==========
 
 
+5.0.0
+-----
+
+* Upgraded to Django 4.2.
+
+
 4.0.0
 -----
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.9
 
 ENV PYTHONPATH=/app
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Requirements
 ------------
 
 * Python 3.8-3.10
-* Django 4.1
+* Django 4.2
 
 
 Installation

diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
@@ -1 +1 @@
-django~=4.1.2
+django~=4.2.1
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='django-nomination',
-    version='4.0.0',
+    version='5.0.0',
     packages=find_packages(exclude=['tests*']),
     description='',
     long_description='See the home page for more information.',
@@ -29,7 +29,7 @@
     classifiers=[
         'Natural Language :: English',
         'Environment :: Web Environment',
-        'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.8',

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -532,7 +532,7 @@ def test_base_context_values(self, client):
         response = client.get(reverse('url_add', args=[project.project_slug]))
 
         assert response.context['project'] == project
-        assert type(response.context['form']) == views.URLForm
+        assert isinstance(response.context['form'], views.URLForm)
         assert response.context['metadata_vals'][0][0] == project_metadata
         assert list(response.context['metadata_vals'][0][1]) == []
         assert response.context['institutions'] == json.dumps(sorted(institutions))

diff --git a/tox.ini b/tox.ini
@@ -3,15 +3,15 @@ addopts = --reuse-db
 DJANGO_SETTINGS_MODULE = tests.settings
 
 [tox]
-envlist = py{38,39,310}-django41, py39-flake8
+envlist = py{38,39,310}-django42, py39-flake8
 
 [flake8]
 exclude = *migrations/*
 max-line-length = 99
 
 [testenv]
 deps =
-    django41: Django~=4.1.2
+    django42: Django~=4.2.1
     -rrequirements/requirements-common.txt
     -rrequirements/requirements-test.txt
 commands = pytest --cov-config .coveragerc --cov-report term-missing --cov nomination