Merge pull request #214 from neutronX/django-4

Django 4

.travis.yml

@@ -31,6 +31,22 @@ matrix:
       env: DJANGO=3.0.*
     - python: 3.8
       env: DJANGO=3.1.*
+    - python: 3.8
+      env: DJANGO=3.2.*
+
+    - python: 3.9
+      env: DJANGO=3.1.*
+    - python: 3.9
+      env: DJANGO=3.2.*
+    - python: 3.9
+      env: DJANGO=4.0.*
+
+    - python: 3.10
+      env: DJANGO=3.1.*
+    - python: 3.10
+      env: DJANGO=3.2.*
+    - python: 3.10
+      env: DJANGO=4.0.*
 
     - os: osx
       language: generic

README.rst

@@ -44,5 +44,5 @@ Preview
 .. |Build_Status| image:: https://img.shields.io/travis/neutronX/django-markdownx.svg
 .. |Format| image:: https://img.shields.io/pypi/format/django-markdownx.svg
 .. |Supported_versions_of_Python| image:: https://img.shields.io/pypi/pyversions/django-markdownx.svg
-.. |Supported_versions_of_Django| image:: https://img.shields.io/badge/Django-2.0,%202.1,%202.2,%203.0-green.svg
+.. |Supported_versions_of_Django| image:: https://img.shields.io/badge/Django-2.0,%202.1,%202.2,%203.0,%203.1,%203.2,%204.0-green.svg
 .. |License| image:: https://img.shields.io/pypi/l/django-markdownx.svg

docs-src/index.md

@@ -4,7 +4,7 @@
 ![](https://img.shields.io/pypi/status/django-markdownx.svg)
 ![](https://img.shields.io/travis/neutronX/django-markdownx.svg)
 ![](https://img.shields.io/pypi/pyversions/django-markdownx.svg)
-![](https://img.shields.io/badge/Django-2.0,%202.1,%202.2,%203.0-green.svg)
+![](https://img.shields.io/badge/Django-2.0,%202.1,%202.2,%203.0,%203.1,%203.2,%204.0-green.svg)
 ![](https://img.shields.io/pypi/l/django-markdownx.svg)
 
 Django MarkdownX is a comprehensive [Markdown](https://en.wikipedia.org/wiki/Markdown) plugin built for [Django](https://www.djangoproject.com), the renowned high-level Python web framework, with flexibility, extensibility, and ease-of-use at its core.

markdownx/__init__.py

@@ -66,7 +66,7 @@ __copyright__ = 'Copyright 2017'
 __license__ = 'BSD'
 __maintainer__ = 'Adi, Pouria Hadjibagheri'
 __url__ = 'https://github.com/neutronX/django-markdownx'
-__version__ = '3.0.1'
+__version__ = '4.0.0'
 __description__ = 'A comprehensive Markdown editor built for Django.'
 # ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
 

setup.py

@@ -102,6 +102,8 @@ setup(
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
         'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
@@ -109,6 +111,8 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: JavaScript',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Multimedia :: Graphics',

testapp/settings.py

@@ -70,6 +70,7 @@ TEMPLATES = [
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.media',
                 'django.template.context_processors.static',
+                'django.template.context_processors.request',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
             ],
@@ -81,3 +82,5 @@ TEMPLATES = [
 MARKDOWNX_MARKDOWN_EXTENSIONS = [
     'markdown.extensions.extra',
 ]
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

testapp/urls.py

@@ -1,5 +1,10 @@
 from django.conf import settings
-from django.conf.urls import include, url
+
+try:
+    from django.conf.urls import include, url
+except ImportError:
+    from django.urls import include, re_path as url
+
 from django.conf.urls.static import static
 from django.contrib import admin
 
@@ -10,4 +15,5 @@ urlpatterns = [
     url(r'^$', TestFormView.as_view(), name='form_view'),
     url(r'^markdownx/', include('markdownx.urls')),
     url(r'^admin/', admin.site.urls),
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    *static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+]