Fix django-commons#1565 Remove Python 3.6 due to EOL

pauloxnet · Dec 23, 2021 · a99e539 · a99e539
1 parent 46b661f
commit a99e539
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     services:
       mariadb:
@@ -82,7 +82,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         database: [postgresql, postgis]
 
     services:
@@ -151,7 +151,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     rev: v2.29.1
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
 -   repo: https://github.com/adamchainz/django-upgrade
     rev: 1.4.0
     hooks:
@@ -55,4 +55,4 @@ repos:
     hooks:
     -   id: black
         language_version: python3
-        entry: black --target-version=py36
+        entry: black --target-version=py37
diff --git a/setup.cfg b/setup.cfg
@@ -22,15 +22,14 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    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
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     Django >= 3.2
     sqlparse >= 0.2.0

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     docs
     packaging
-    py{36,37}-dj{32}-{sqlite,postgresql,postgis,mysql}
+    py{37}-dj{32}-{sqlite,postgresql,postgis,mysql}
     py{38,39,310}-dj{32,40,main}-{sqlite,postgresql,postgis,mysql}
 
 [testenv]
@@ -42,25 +42,25 @@ whitelist_externals = make
 pip_pre = True
 commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}
 
-[testenv:py{36,37,38,39,310}-dj{40,main}-postgresql]
+[testenv:py{37,38,39,310}-dj{40,main}-postgresql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgresql
     DB_PORT = {env:DB_PORT:5432}
 
-[testenv:py{36,37,38,39,310}-dj{32,40,main}-postgis]
+[testenv:py{37,38,39,310}-dj{32,40,main}-postgis]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgis
     DB_PORT = {env:DB_PORT:5432}
 
-[testenv:py{36,37,38,39,310}-dj{32,40,main}-mysql]
+[testenv:py{37,38,39,310}-dj{32,40,main}-mysql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = mysql
     DB_PORT = {env:DB_PORT:3306}
 
-[testenv:py{36,37,38,39,310}-dj{32,40,main}-sqlite]
+[testenv:py{37,38,39,310}-dj{32,40,main}-sqlite]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = sqlite3
@@ -84,7 +84,6 @@ skip_install = true
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39