chore: Compatibility with django 5.x (#8)

Author: fdintino

.github/workflows/test.yml

@@ -7,17 +7,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9"]
-        django-version: ["2.2", "3.2", "4.2"]
         include:
-          - python-version: "3.7"
-            django-version: "2.2"
-          - python-version: "3.10"
-            django-version: "3.2"
-          - python-version: "3.10"
-            django-version: "4.2"
-          - python-version: "3.11"
-            django-version: "4.2"
+          - django-version: "2.2"
+            python-version: "3.8"
+          - django-version: "3.2"
+            python-version: "3.9"
+          - django-version: "4.2"
+            python-version: "3.10"
+          - django-version: "4.2"
+            python-version: "3.11"
+          - django-version: "5.1"
+            python-version: "3.12"
+          - django-version: "5.2"
+            python-version: "3.13"
 
     name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})
 

generic_plus/curation/fields.py

@@ -56,7 +56,13 @@ def __init__(self, ct_field='content_type', fk_field='object_id',
 
     @property
     def attname(self):
-        return self.name
+        if not hasattr(self, "_attname"):
+            self._attname = self.name
+        return self._attname
+
+    @attname.setter
+    def attname(self, value):
+        self._attname = value
 
     def formfield(self, **kwargs):
         defaults = {

generic_plus/fields.py

@@ -66,6 +66,9 @@ class GenericForeignFileField(GenericRelation):
     generic_descriptor = None
     file_descriptor = None
 
+    empty_strings_allowed = True
+    rel_class = GenericRel
+
     file_descriptor_cls = FileDescriptor
     file_field_cls = models.FileField
     rel_file_field_name = 'file'
@@ -134,6 +137,9 @@ def __init__(self, to, rel_file_field_name=None, field_identifier="",
 
         self.file_kwargs['db_column'] = kwargs.get('db_column', self.name)
 
+    def get_cache_name(self):
+        return self.name
+
     def get_cached_value(self, instance, **kwargs):
         cache_name = self.get_cache_name()
         if django.VERSION > (2, 0):
@@ -219,6 +225,16 @@ def is_cached(self, instance):
             return hasattr(instance, self.get_cache_name())
 
     def get_prefetch_queryset(self, instances, queryset=None):
+        if queryset is None:
+            return self.get_prefetch_querysets(instances)
+        return self.get_prefetch_querysets(instances, [queryset])
+
+    def get_prefetch_querysets(self, instances, querysets=None):
+        if querysets is not None:
+            raise Exception(
+                "Passing querysets in generic_plus get_prefetch_querysets is "
+                "not yet supported"
+            )
         models = set([type(i) for i in instances])
 
         # Handle case where instances are different models (and consequently,
@@ -401,7 +417,15 @@ def __get__(self, instance, instance_type=None):
             'prefetch_cache_name': self.field.attname,
         }
 
-        join_cols = self.field.get_joining_columns(reverse_join=True)[0]
+        if hasattr(self.field, "get_joining_fields"):
+            join_cols = tuple(
+                (lhs_field.column, rhs_field.column)
+                for lhs_field, rhs_field in self.field.get_joining_fields(
+                    reverse_join=True
+                )
+            )[0]
+        else:
+            join_cols = self.field.get_joining_columns(reverse_join=True)[0]
 
         ct_manager = ContentType.objects.db_manager(instance._state.db)
         content_type = ct_manager.get_for_model(instance, for_concrete_model=self.for_concrete_model)

generic_plus/tests/conftest.py

@@ -0,0 +1,12 @@
+import warnings
+
+import pytest
+from django.test import TestCase
+
+
+TestCase.pytestmark = pytest.mark.django_db(transaction=True, reset_sequences=True)
+
+
+@pytest.fixture(autouse=True)
+def suppress_warnings():
+    warnings.simplefilter("error", Warning)

pyproject.toml

@@ -0,0 +1,52 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools>=75.3.2"]
+
+[project]
+name = "django-generic-plus"
+dynamic = ["version"]
+description = "Django model field that combines the functionality of GenericForeignKey and FileField"
+readme = "README.rst"
+license = { text = "BSD-2-Clause" }
+requires-python = ">=3"
+authors = [
+    { name = "The Atlantic", email = "[email protected]" },
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Framework :: Django :: 2.2",
+    "Framework :: Django :: 3.2",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.1",
+    "Framework :: Django :: 5.2",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+    "python-monkey-business>=1.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/theatlantic/django-generic-plus"
+
+[tool.setuptools]
+zip-safe = false
+platforms = ["any"]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["generic_plus*"]
+namespaces = false
+
+[tool.setuptools.dynamic]
+version = { attr = "generic_plus.__version__" }
+readme = { file = ["README.rst"] }

pytest.ini

@@ -0,0 +1,7 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = generic_plus.tests.settings
+addopts = --tb=short --create-db
+django_find_project = false
+python_files = tests.py test_*.py *_tests.py
+pythonpath = .
+testpaths = generic_plus/tests

setup.py

@@ -1,40 +1,3 @@
-#!/usr/bin/env python
-from setuptools import setup, find_packages
+from setuptools import setup
 
-
-setup(
-    name='django-generic-plus',
-    version=__import__("generic_plus").__version__,
-    install_requires=[
-        'python-monkey-business>=1.0.0',
-    ],
-    description="Django model field that combines the functionality of "
-                "GenericForeignKey and FileField",
-    long_description=open('README.rst').read(),
-    license='BSD',
-    platforms="any",
-    author='The Atlantic',
-    author_email='[email protected]',
-    url='https://github.com/theatlantic/django-generic-plus',
-    packages=find_packages(),
-    python_requires='>=3',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Framework :: Django',
-        'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
-        'Framework :: Django :: 4.1',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-    ],
-    include_package_data=True,
-    zip_safe=False)
+setup()

tox.ini

@@ -1,8 +1,12 @@
 [tox]
 envlist =
-    py{37,38,39}-dj22
-    py{37,38,39,310}-dj32
-    py{38,39,310,311}-dj42
+    py{36,37,38,39}-dj22
+    py{36,37,38,39,310}-dj32
+    py{38,39,310}-dj40
+    py{38,39,310,311}-dj41
+    py{38,39,310,311,312}-dj42
+    py{310,311,312}-dj{50,51}
+    py{310,311,312,313}-dj52
 
 [gh-actions]
 python =
@@ -11,16 +15,23 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
+    3.13: py313
 
 [gh-actions:env]
 DJANGO =
     2.2: dj22
     3.2: dj32
+    4.0: dj40
+    4.1: dj41
     4.2: dj42
+    5.0: dj50
+    5.1: dj51
+    5.2: dj52
 
 [testenv]
 commands =
-    python runtests.py {posargs} --noinput
+    pytest {posargs}
 passenv =
     DATABASE_URL
 deps =
@@ -29,4 +40,11 @@ deps =
     !dj22: dj-database-url
     dj22: Django>=2.2,<3.0
     dj32: Django>=3.2,<4.0
-    dj42: Django>=4.2,<5.0
+    dj40: Django>=4.0,<4.1
+    dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<4.3
+    dj50: Django>=5.0,<5.1
+    dj51: Django>=5.1a1,<5.2
+    dj52: Django>=5.2,<5.3
+    pytest
+    pytest-django