support for Django 3.2, and 4.2 (#313)

Makefile

@@ -21,7 +21,7 @@ sdist: test clean
 	python setup.py sdist
 
 release: sdist
-	twine upload dist/*
+	twine check dist/* && twine upload dist/*
 
 txpush:
 	python manage.py spiritmakemessages --locale en && \

README.md

@@ -1,6 +1,6 @@
 # Spirit
 
-[![Build Status](https://img.shields.io/github/workflow/status/nitely/Spirit/CI/master?style=flat-square)](https://github.com/nitely/Spirit/actions?query=workflow%3ACI)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/nitely/Spirit/ci.yml?branch=master&style=flat-square)](https://github.com/nitely/Spirit/actions?query=workflow%3ACI)
 [![Coverage Status](https://img.shields.io/coveralls/nitely/Spirit/master.svg?style=flat-square)](https://coveralls.io/r/nitely/Spirit)
 [![pypi](https://img.shields.io/pypi/v/django-spirit.svg?style=flat-square)](https://pypi.python.org/pypi/django-spirit)
 [![licence](https://img.shields.io/pypi/l/django-spirit.svg?style=flat-square)](https://raw.githubusercontent.com/nitely/Spirit/master/LICENSE)
@@ -15,8 +15,8 @@ Docs can be found at [spirit.readthedocs.io](http://spirit.readthedocs.io/en/lat
 
 ## Compatibility
 
-* Python 3.5, 3.6, 3.7, and 3.8 (recommended)
-* Django 2.2 LTS (recommended), 3.0, and 3.1
+* Python 3.8, 3.9, 3.10, and 3.11 (recommended)
+* Django 3.2 LTS, and 4.2 LTS
 * PostgreSQL (recommended), MySQL, Oracle Database and SQLite
 
 Constrained by "[What Python version can I use with Django?](https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django)"

docs/installation.rst

@@ -6,8 +6,8 @@ Installation
 Compatibility
 -------------
 
-* Python 3.5, 3.6, 3.7, and 3.8 (recommended)
-* Django 2.2 LTS (recommended), 3.0, and 3.1
+* Python 3.8, 3.9, 3.10, and 3.11 (recommended)
+* Django 3.2 LTS, and 4.2 LTS (recommended)
 * PostgreSQL (recommended), MySQL, Oracle Database and SQLite
 
 Constrained by `What Python version can I use with Django? <https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django>`_

requirements.txt

@@ -1,9 +1,10 @@
-Django>=2.2,<3.2
-django-haystack==3.0
+Django>=3.2,<5
+django-haystack==3.2.1
 whoosh==2.7.4
 mistune==0.8.4
-Pillow==8.0.1
+Pillow==9.5.0
 olefile==0.46
 django-infinite-scroll-pagination>=1.1.0,<1.2
-django-djconfig>=0.8.0,<0.11
+django-djconfig>=0.11.0,<0.12
 pytz
+tzdata

setup.py

@@ -22,7 +22,7 @@
 if sys.platform.startswith(('win32', 'darwin')):
     PYTHON_MAGIC_DEP = ['python-magic-bin==0.4.14']
 else:  # Linux?
-    PYTHON_MAGIC_DEP = ['python-magic==0.4.15']
+    PYTHON_MAGIC_DEP = ['python-magic==0.4.27']
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
@@ -47,7 +47,7 @@
     install_requires=REQUIREMENTS,
     extras_require={
         'files': PYTHON_MAGIC_DEP,
-        'huey': 'huey == 2.3.0',
+        'huey': 'huey == 2.4.5',
         'celery': 'celery[redis] == 4.4.7'},
     license='MIT License',
     classifiers=[

spirit/admin/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.admin.apps.SpiritAdminConfig'

spirit/admin/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import include, re_path
+from django.urls import include, re_path
 
 from . import views
 import spirit.category.admin.urls

spirit/category/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.category.apps.SpiritCategoryConfig'

spirit/category/admin/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.category.admin.apps.SpiritCategoryAdminConfig'

spirit/category/admin/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from ...core.conf import settings
 from . import views

spirit/category/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCategoryConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.category'
     verbose_name = "Spirit Category"
     label = 'spirit_category'

spirit/category/migrations/0007_alter_category_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_category', '0006_auto_20190120_0406'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/category/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.apps.SpiritCommentConfig'

spirit/comment/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment'
     verbose_name = "Spirit Comment"
     label = 'spirit_comment'

spirit/comment/bookmark/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.bookmark.apps.SpiritCommentBookmarkConfig'

spirit/comment/bookmark/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentBookmarkConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment.bookmark'
     verbose_name = "Spirit Comment Bookmark"
     label = 'spirit_comment_bookmark'

spirit/comment/bookmark/migrations/0003_alter_commentbookmark_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment_bookmark', '0002_auto_20150828_2003'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='commentbookmark',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/bookmark/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/flag/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.flag.apps.SpiritCommentFlagConfig'

spirit/comment/flag/admin/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.flag.admin.apps.SpiritCommentFlagAdminConfig'

spirit/comment/flag/admin/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/flag/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentFlagConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment.flag'
     verbose_name = "Spirit Comment Flag"
     label = 'spirit_comment_flag'

spirit/comment/flag/migrations/0003_auto_20230405_2103.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment_flag', '0002_auto_20150828_2003'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='commentflag',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='flag',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/flag/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/history/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.history.apps.SpiritCommentHistoryConfig'

spirit/comment/history/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentHistoryConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment.history'
     verbose_name = "Spirit Comment History"
     label = 'spirit_comment_history'

spirit/comment/history/migrations/0002_alter_commenthistory_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment_history', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='commenthistory',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/history/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/like/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.like.apps.SpiritCommentLikeConfig'

spirit/comment/like/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentLikeConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment.like'
     verbose_name = "Spirit Comment Like"
     label = 'spirit_comment_like'

spirit/comment/like/migrations/0003_alter_commentlike_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment_like', '0002_auto_20150828_2003'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='commentlike',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/like/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views
 

spirit/comment/migrations/0005_alter_comment_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment', '0004_auto_20160315_2021'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comment',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/poll/__init__.py

@@ -1,3 +1 @@
 # -*- coding: utf-8 -*-
-
-default_app_config = 'spirit.comment.poll.apps.SpiritCommentPollConfig'

spirit/comment/poll/apps.py

@@ -5,6 +5,7 @@
 
 class SpiritCommentPollConfig(AppConfig):
 
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'spirit.comment.poll'
     verbose_name = "Spirit Comment Poll"
     label = 'spirit_comment_poll'

spirit/comment/poll/migrations/0003_auto_20230405_2106.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.18 on 2023-04-05 21:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment_poll', '0002_auto_20190304_2115'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='commentpoll',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='commentpollchoice',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='commentpollvote',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

spirit/comment/poll/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import re_path
+from django.urls import re_path
 
 from . import views