Merge pull request #188 from tim-schilling/update-versions

Update supported versions to Django 3.2-4.1, python 3.6-3.10.

Author: agusmakmun

.github/workflows/run-tests.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         os: [ macos-latest, ubuntu-latest ]
         python-version: [ 3.9, "3.10" ]
-        django-version: [ 3.1, 3.2, 4.0 ]
+        django-version: [ 3.2, 4.0, 4.1 ]
 
     steps:
       - name: Install system dependencies (windows)

README.md

@@ -31,7 +31,7 @@
 
 ### Requirements
 
-* `Django>=2.0`
+* `Django>=3.2`
 * `Markdown>=3.0`
 * `requests>=2.12.4`
 
@@ -62,17 +62,10 @@ INSTALLED_APPS = [
 
 ```python
 # urls.py
-# django >= 2.0
 urlpatterns = [
     ...
     path('martor/', include('martor.urls')),
 ]
-
-# django <= 1.9
-urlpatterns = [
-    ...
-    url(r'^martor/', include('martor.urls')),
-]
 ```
 
 
@@ -351,7 +344,7 @@ Checkout at http://127.0.0.1:8000/simple-form/ on your browser.
 [7]: https://img.shields.io/pypi/pyversions/martor.svg
 [8]: https://pypi.python.org/pypi/martor
 
-[9]: https://img.shields.io/badge/Django-1.8%20%3E=%204.0-green.svg
+[9]: https://img.shields.io/badge/Django-3.2%20%3E=%204.1-green.svg
 [10]: https://www.djangoproject.com
 
 [11]: https://travis-ci.org/agusmakmun/django-markdown-editor.svg?branch=master

martor_demo/martor_demo/settings.py

@@ -24,6 +24,8 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = '+1zhx_fpkkyj&z+3n!63fx0)og)@h5^7qyr8e0s%c@p8_&t&+l'
 
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 ALLOWED_HOSTS = ['*']

runtests.py

@@ -51,15 +51,10 @@
     ]
 )
 
-try:
-    # Django >= 1.8
-    django.setup()
-    from django.test.runner import DiscoverRunner
-    test_runner = DiscoverRunner(verbosity=1)
-except (ImportError, ModuleNotFoundError):
-    # Django <= 1.8
-    from django.test.simple import DjangoTestSuiteRunner
-    test_runner = DjangoTestSuiteRunner(verbosity=1)
+django.setup()
+from django.test.runner import DiscoverRunner
+test_runner = DiscoverRunner(verbosity=1)
+
 
 failures = test_runner.run_tests(['martor'])
 if failures:

setup.py

@@ -25,15 +25,9 @@ def get_requirements():
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: JavaScript',
@@ -42,6 +36,7 @@ def get_requirements():
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
     ],