From fe094f51c95ad4d15bbfab8a2286183a6f483d8d Mon Sep 17 00:00:00 2001
From: Henri Hulski <henri.hulski@gazeta.pl>
Date: Tue, 12 Apr 2022 13:48:50 +0200
Subject: [PATCH] refactor: drop support for Python 3.6

BREAKING CHANGE: bleach 5 doesn't support Python 3.6
---
 .github/workflows/main.yml                             | 8 --------
 docs/overview.rst                                      | 2 +-
 mezzanine/bin/management/commands/mezzanine_project.py | 2 +-
 setup.cfg                                              | 3 +--
 tox.ini                                                | 6 +++---
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 036df23d0d..7a8a7a0795 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,6 @@ jobs:
       matrix:
         include:
           # Django 2.2
-          - tox-env: "py36-dj22"
-            python-version: "3.6"
           - tox-env: "py37-dj22"
             python-version: "3.7"
           - tox-env: "py38-dj22"
@@ -24,8 +22,6 @@ jobs:
           - tox-env: "py39-dj22"
             python-version: "3.9"
           # Django 3.0
-          - tox-env: "py36-dj30"
-            python-version: "3.6"
           - tox-env: "py37-dj30"
             python-version: "3.7"
           - tox-env: "py38-dj30"
@@ -33,8 +29,6 @@ jobs:
           - tox-env: "py39-dj30"
             python-version: "3.9"
           # Django 3.1
-          - tox-env: "py36-dj31"
-            python-version: "3.6"
           - tox-env: "py37-dj31"
             python-version: "3.7"
           - tox-env: "py38-dj31"
@@ -42,8 +36,6 @@ jobs:
           - tox-env: "py39-dj31"
             python-version: "3.9"
           # Django 3.2
-          - tox-env: "py36-dj32"
-            python-version: "3.6"
           - tox-env: "py37-dj32"
             python-version: "3.7"
           - tox-env: "py38-dj32"
diff --git a/docs/overview.rst b/docs/overview.rst
index 5abc4a9656..561cda329b 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -45,7 +45,7 @@ standard Django environment), with the following dependencies, which
 unless noted as optional, should be installed automatically following
 the above instructions:
 
-* `Python`_ 3.6 to 3.10
+* `Python`_ 3.7 to 3.10
 * `Django`_ 2.2 to 4.0
 * `django-contrib-comments`_ - for built-in threaded comments
 * `Pillow`_ - for image resizing (`Python Imaging Library`_ fork)
diff --git a/mezzanine/bin/management/commands/mezzanine_project.py b/mezzanine/bin/management/commands/mezzanine_project.py
index b873cd6b38..b072aae5ec 100644
--- a/mezzanine/bin/management/commands/mezzanine_project.py
+++ b/mezzanine/bin/management/commands/mezzanine_project.py
@@ -68,7 +68,7 @@ def handle(self, *args, **options):
 
         # The project template dir in Mezzanine requires __init__.py so that
         # the documentation can be generated, but including it in new projects
-        # causes issues with running tests under Python >= 3.6, so remove it.
+        # causes issues with running tests under Python >= 3.7, so remove it.
         os.remove(os.path.join(project_dir, "__init__.py"))
 
     def get_project_directory(self, name, target):
diff --git a/setup.cfg b/setup.cfg
index 5d11c50e18..7ebcd60be6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,6 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -36,7 +35,7 @@ classifiers =
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 packages = mezzanine
 include_package_data = true
 install_requires =
diff --git a/tox.ini b/tox.ini
index 44396d40ab..b4afcf5efc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38,39,310}-dj{22,30,31,32,40}
+    py{37,38,39,310}-dj{22,30,31,32,40}
     package
     lint
 
@@ -42,7 +42,7 @@ skip_install = true
 allowlist_externals = sh
 deps = .[codestyle]
 commands =
-    sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} +'
+    sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py37-plus \{\} +'
 
 [testenv:format]
 # This env is not run by default. It's provided here for you to easily
@@ -51,7 +51,7 @@ skip_install = true
 allowlist_externals = sh
 deps = .[codestyle]
 commands =
-    sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} \;'
+    sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py37-plus \{\} \;'
     isort --atomic .
     black .