From dde69e86e08921d7a51d5926146a54cbeb9b1cc1 Mon Sep 17 00:00:00 2001
From: Stephen Rosen <sirosen@globus.org>
Date: Sun, 3 Jul 2022 22:18:49 -0400
Subject: [PATCH] Remove support for python3.6 (#777)

---
 .github/workflows/main.yml | 2 +-
 .pre-commit-config.yaml    | 4 ++--
 CHANGELOG.rst              | 1 +
 setup.cfg                  | 5 ++---
 tox.ini                    | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 55144b39..70cf628d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         platform: ["ubuntu-latest", "windows-latest"]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10",
+        python-version: ["3.7", "3.8", "3.9", "3.10",
                          "3.11.0-beta - 3.11", "pypy-3.8", "pypy-3.9"]
 
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 210e4a94..45f263a1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,13 +3,13 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-        args: ["--target-version=py36"]
+        args: ["--target-version=py37"]
 
   - repo: https://github.com/asottile/blacken-docs
     rev: v1.12.1
     hooks:
       - id: blacken-docs
-        args: ["--target-version=py36"]
+        args: ["--target-version=py37"]
 
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 81d421e2..3ed65591 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,6 +10,7 @@ This project adheres to `Semantic Versioning <https://semver.org/>`__.
 Changed
 ~~~~~~~
 - Skip keys with incompatible alg when loading JWKSet by @DaGuich in https://github.com/jpadilla/pyjwt/pull/762
+- Remove support for python3.6
 
 Fixed
 ~~~~~
diff --git a/setup.cfg b/setup.cfg
index 0c98d75e..67d30a7b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,6 @@ 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
@@ -33,7 +32,7 @@ classifiers =
 [options]
 zip_safe = false
 include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
 packages = find:
 
 [options.package_data]
@@ -68,7 +67,7 @@ exclude =
 extend-ignore = E203, E501
 
 [mypy]
-python_version = 3.6
+python_version = 3.7
 ignore_missing_imports = true
 warn_unused_ignores = true
 no_implicit_optional = true
diff --git a/tox.ini b/tox.ini
index 74fff6a2..3e8513a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,6 @@ filterwarnings =
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37, docs
     3.8: py38, typing
     3.9: py39
@@ -22,7 +21,7 @@ python =
 envlist =
     lint
     typing
-    py{36,37,38,39,310,311,py3}-{crypto,nocrypto}
+    py{37,38,39,310,311,py3}-{crypto,nocrypto}
     docs
     pypi-description
     coverage-report