Merge pull request #2312 from jeromelebleu/python3.9

Added support for Python 3.9 and dropped <3.7

.github/workflows/modoboa.yml

@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         database: ['postgres', 'mysql']
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
       fail-fast: false
 
     steps:

requirements.txt

@@ -11,9 +11,7 @@ dj-database-url
 djangorestframework>=3.11,<3.13
 drf-spectacular
 uritemplate
-# We fix jwt package versions because of python3.6
-djangorestframework-simplejwt==4.4.0
-pyjwt==1.7.1
+djangorestframework-simplejwt==4.7.1
 drf-flex-fields
 
 passlib~=1.7.4

setup.py

@@ -66,10 +66,9 @@ if __name__ == "__main__":
             "License :: OSI Approved :: ISC License (ISCL)",
             "Operating System :: OS Independent",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.5",
-            "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
+            "Programming Language :: Python :: 3.9",
             "Topic :: Communications :: Email",
             "Topic :: Internet :: WWW/HTTP",
         ],
@@ -80,7 +79,7 @@ if __name__ == "__main__":
         scripts=["bin/modoboa-admin.py"],
         install_requires=INSTALL_REQUIRES,
         use_scm_version={"local_scheme": local_scheme},
-        python_requires=">=3.4",
+        python_requires=">=3.7",
         setup_requires=["setuptools_scm"],
         extras_require={
             "ldap": LDAP_REQUIRES,

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37}
+envlist = py{37,38,39}
 
 [testenv]
 changedir = test_project