fix: Add django 4.2 support (#193)

* fix: Add django 4.2 support
openedx · Sep 20, 2023 · a720021 · a720021
1 parent ce6267f
commit a720021
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
  matrix:
  os: [ubuntu-20.04]
  python-version: ['3.8']
- toxenv: [django32, django40]
+ toxenv: [django32, django42]
  steps:
  - uses: actions/checkout@v1
  - name: setup python

diff --git a/setup.py b/setup.py
@@ -78,11 +78,10 @@ def is_requirement(line):
  'Framework :: Django',
  'Intended Audience :: Developers',
  'Operating System :: OS Independent',
- 'Programming Language :: Python :: 3',
  'Programming Language :: Python :: 3.8',
  'Framework :: Django',
  'Framework :: Django :: 3.2',
- 'Framework :: Django :: 4.0',
+ 'Framework :: Django :: 4.2',
  'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
  'Topic :: Software Development',
  'Topic :: Software Development :: Libraries :: Application Frameworks',

diff --git a/testproject/testproject/db/prepopulated.db b/testproject/testproject/db/prepopulated.db
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py38-django{32,40}
+envlist = py38-django{32, 42}
 
 [testenv]
-deps =
+deps = 
  django32: -r requirements/django.txt
- django40: django>4.0,<4.1
- -r{toxinidir}/requirements/test.txt
-changedir={toxinidir}/testproject/
-commands =
+ django42: Django>=4.2,<4.3
+ -r{toxinidir}/requirements/test.txt
+changedir = {toxinidir}/testproject/
+commands = 
  pytest --cov wiki --cov django_notify
+
diff --git a/wiki/admin.py b/wiki/admin.py
@@ -73,9 +73,11 @@ class URLPathAdmin(MPTTModelAdmin):
  'articles__article__modified')
  list_display = ('__unicode__', 'article', 'get_created')
 
+ @admin.display(
+ description=_('created')
+ )
  def get_created(self, instance):
  return instance.article.created
- get_created.short_description = _('created')
 
 
 admin.site.register(models.URLPath, URLPathAdmin)

diff --git a/wiki/plugins/attachments/__init__.py b/wiki/plugins/attachments/__init__.py
@@ -0,0 +1 @@
+