Check compatibility with Django 5.2 and Python 3.13.

Author: richardbarran

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false # If one test fails, complete the other jobs.
       matrix:
-        python: [ 3.8, 3.9, '3.10' ]
+        python: [ 3.8, 3.9, '3.10', '3.11', '3.12', '3.13' ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -26,20 +26,20 @@ jobs:
       - name: Run tests
         run: tox
       - name: Flake8
-        if: ${{ matrix.python == '3.8' }}
+        if: ${{ matrix.python == '3.12' }}
         run: |
           pip install flake8
           flake8 ./
       - name: Isort
-        if: ${{ matrix.python == '3.8' }}
+        if: ${{ matrix.python == '3.12' }}
         uses: jamescurtin/isort-action@master
       - name: Coverage
-        if: ${{ matrix.python == '3.8' }}
+        if: ${{ matrix.python == '3.12' }}
         run: |
           pip install coverage[toml] django
           coverage run ./example_project/manage.py test photologue
       - name: Upload coverage
-        if: ${{ matrix.python == '3.8' }}
+        if: ${{ matrix.python == '3.12' }}
         uses: codecov/codecov-action@v1
         with:
           name: Python ${{ matrix.python }}

CHANGELOG.txt

@@ -4,7 +4,8 @@ Changelog
 3.18 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Checked compatibility with Django 5.1 and 5.2.
+- Dropped Django 3.2 and 4.1.
 
 
 3.17 (2023-10-25)

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2019, Justin C. Driscoll and all the people named in CONTRIBUTORS.txt.
+Copyright (c) 2007-2025, Justin C. Driscoll and all the people named in CONTRIBUTORS.txt.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

example_project/example_project/settings.py

@@ -10,7 +10,7 @@
 
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 
 INSTALLED_APPS = (

example_project/requirements.txt

@@ -1,6 +1,6 @@
 -r ../requirements.txt
 # The following is only required if developing for Photologue.
-factory-boy
+factory-boy>=3.3.2 # Note: version that formally supports Dj5.2 not yet released.
 # The following is only required if you plan on using Amazon AWS S3
 # -r example_storages/s3_requirements.txt
 

photologue/tests/test_zipupload.py

@@ -74,16 +74,16 @@ def test_good_data(self):
 
         self.assertEqual(response['Location'], location)
 
-        self.assertQuerysetEqual(Gallery.objects.all(),
+        self.assertQuerySetEqual(Gallery.objects.all(),
                                  ['<Gallery: This is a test title>'],
                                  transform=repr)
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  ['<Photo: This is a test title 1>'],
                                  transform=repr)
 
         # The photo is attached to the gallery.
         gallery = Gallery.objects.get(title='This is a test title')
-        self.assertQuerysetEqual(gallery.photos.all(),
+        self.assertQuerySetEqual(gallery.photos.all(),
                                  ['<Photo: This is a test title 1>'],
                                  transform=repr)
 
@@ -116,10 +116,10 @@ def test_not_image(self):
             response = self.client.post('/admin/photologue/photo/upload_zip/', test_data)
             self.assertEqual(response.status_code, 302)
 
-        self.assertQuerysetEqual(Gallery.objects.all(),
+        self.assertQuerySetEqual(Gallery.objects.all(),
                                  ['<Gallery: This is a test title>'],
                                  transform=repr)
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  ['<Photo: This is a test title 1>'],
                                  transform=repr)
 
@@ -135,10 +135,10 @@ def test_ignored(self):
             response = self.client.post('/admin/photologue/photo/upload_zip/', test_data)
             self.assertEqual(response.status_code, 302)
 
-        self.assertQuerysetEqual(Gallery.objects.all(),
+        self.assertQuerySetEqual(Gallery.objects.all(),
                                  ['<Gallery: This is a test title>'],
                                  transform=repr)
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  ['<Photo: This is a test title 1>'],
                                  transform=repr)
 
@@ -153,15 +153,15 @@ def test_existing_gallery(self):
         response = self.client.post('/admin/photologue/photo/upload_zip/', test_data)
         self.assertEqual(response.status_code, 302)
 
-        self.assertQuerysetEqual(Gallery.objects.all(),
+        self.assertQuerySetEqual(Gallery.objects.all(),
                                  ['<Gallery: Existing>'],
                                  transform=repr)
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  ['<Photo: Existing 1>'],
                                  transform=repr)
 
         # The photo is attached to the existing gallery.
-        self.assertQuerysetEqual(existing_gallery.photos.all(),
+        self.assertQuerySetEqual(existing_gallery.photos.all(),
                                  ['<Photo: Existing 1>'],
                                  transform=repr)
 
@@ -177,7 +177,7 @@ def test_existing_gallery_custom_title(self):
         response = self.client.post('/admin/photologue/photo/upload_zip/', test_data)
         self.assertEqual(response.status_code, 302)
 
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  ['<Photo: Custom title 1>'],
                                  transform=repr)
 
@@ -191,7 +191,7 @@ def test_duplicate_slug(self):
         response = self.client.post('/admin/photologue/photo/upload_zip/', test_data)
         self.assertEqual(response.status_code, 302)
 
-        self.assertQuerysetEqual(Photo.objects.all(),
+        self.assertQuerySetEqual(Photo.objects.all(),
                                  [
                                  '<Photo: This is a test title 1>',
                                  '<Photo: This is a test title 2>',

requirements.txt

@@ -1,5 +1,7 @@
 # Note: Specifying django here crashes tox; it's autoinstalled with other packages it
 # so can be removed from this file.
-Pillow>=9
-django-sortedm2m>=3.1.1
+# Cannot force a precise Pillow version as we need to support Py3.8-Py3.13 and there's
+# no Pillow version that meets both requirements.
+Pillow>=10
+django-sortedm2m>=4.0.0 # Support for Django 5.1.
 ExifRead>=3

tox.ini

@@ -5,15 +5,15 @@
 
 [tox]
 envlist =
-    py{38,39}-django32
-    py{38,39,310}-django41
-    py{38,39,310,311}-django42
+    py{38,39,310,311,312}-django42
+    py{310,311,312,313}-django51
+    py{310,311,312,313}-django52
 
 [testenv]
 deps =
-    django32: Django>=3.2,<4.0
-    django41: Django>=4.1,<4.2
     django42: Django>=4.2,<5.0
+    django51: Django>=5.1,<5.2
+    django52: Django>=5.2,<6.0
     -r{toxinidir}/example_project/requirements.txt
 changedir =
     {toxinidir}/example_project/
@@ -26,3 +26,5 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
+    3.13: py313