From f7307905d4758b0053ea2fed9b2e966ddb7c1073 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oleh@pryp.in>
Date: Tue, 23 Aug 2022 18:52:56 +0200
Subject: [PATCH] Drop support for Python 3.6. It's EOL

---
 .github/workflows/tox.yml    |  8 +-------
 requirements/project-min.txt |  2 +-
 requirements/project.txt     |  2 +-
 setup.py                     |  2 +-
 tox.ini                      | 11 +++++------
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index e4ec9d42..e0055dbe 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -7,11 +7,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', pypy-3.7-v7.x]
+        python-version: [3.7, 3.8, 3.9, '3.10', pypy-3.7-v7.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
-          - python-version: 3.6
-            tox-env: py36
           - python-version: 3.7
             tox-env: py37
           - python-version: 3.8
@@ -24,10 +22,6 @@ jobs:
             tox-env: pypy3
         # Just to slim down the test matrix:
         exclude:
-          - python-version: 3.7
-            os: windows-latest
-          - python-version: 3.7
-            os: ubuntu-latest
           - python-version: 3.8
             os: macos-latest
           - python-version: 3.8
diff --git a/requirements/project-min.txt b/requirements/project-min.txt
index c40e3c9e..6627b262 100644
--- a/requirements/project-min.txt
+++ b/requirements/project-min.txt
@@ -16,4 +16,4 @@ mdx_gh_links==0.2
 markdown-callouts==0.2
 mkdocs-redirects==1.0.1
 pymdown-extensions==8.0.1
-mkdocstrings-python==0.7.1; python_version >= '3.7'
+mkdocstrings-python==0.7.1
diff --git a/requirements/project.txt b/requirements/project.txt
index 781b7503..37b8039d 100644
--- a/requirements/project.txt
+++ b/requirements/project.txt
@@ -16,4 +16,4 @@ mdx_gh_links>=0.2
 markdown-callouts>=0.2
 mkdocs-redirects>=1.0.1
 pymdown-extensions>=8.0.1
-mkdocstrings-python>=0.7.1; python_version >= '3.7'
+mkdocstrings-python>=0.7.1
diff --git a/setup.py b/setup.py
index cd518f16..4a008851 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(
         'mergedeep>=1.3.4'
     ],
     extras_require={"i18n": ['babel>=2.9.0']},
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     entry_points={
         'console_scripts': [
             'mkdocs = mkdocs.__main__:cli',
diff --git a/tox.ini b/tox.ini
index c607b793..4d7e3b1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py36-{unittests,min-req},
     py{37,38,39,310,py3}-{unittests,min-req,integration,integration-no-babel},
     black, isort, flake8, markdown-lint, linkchecker, jshint, csslint, nobabel, codespell
 
@@ -9,18 +8,18 @@ passenv = LANG
 deps=
     py{37,38,39,310,py3}-integration: -rrequirements/project.txt
     py{37,38,39,310,py3}-min-req: -rrequirements/project-min.txt
-    py{36,37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt
+    py{37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt
 commands=
     {envpython} --version
-    py{36,37,38,39,310,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs --top-level-directory .
-    py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage xml
-    py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing
+    py{37,38,39,310,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs --top-level-directory .
+    py{37,38,39,310,py3}-unittests: {envbindir}/coverage xml
+    py{37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing
     py{37,38,39,310,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds
 
 [testenv:black]
 deps=black
 skip_install=true
-commands={envbindir}/black -l100 -tpy36 --skip-string-normalization mkdocs
+commands={envbindir}/black -l100 -tpy37 --skip-string-normalization mkdocs
 
 [testenv:isort]
 deps=isort