From 2ef4a48cb25ed25d48c1a421179a1c391e85535c Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 7 Feb 2024 14:58:05 -0500
Subject: [PATCH] Drop python 3.6 and 3.7 and add 3.11 support

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 .github/workflows/build.yml | 14 +++++++-------
 Makefile                    |  3 ++-
 setup.py                    |  5 ++---
 tox.ini                     | 14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c9948d..54d3b49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,10 +14,10 @@
                 "fail-fast": false,
                 "matrix": {
                     "name": [
-                        "python-37",
                         "python-38",
                         "python-39",
                         "python-310",
+                        "python-311",
                         "doc",
                         "doctest",
                         "sphinx",
@@ -26,12 +26,6 @@
                         "codespell",
                     ],
                     "include": [
-                        {
-                            "name": "python-37",
-                            "python": "3.7",
-                            "toxenv": "py37",
-                            "arch": "x64",
-                        },
                         {
                             "name": "python-38",
                             "python": "3.8",
@@ -50,6 +44,12 @@
                             "toxenv": "py310",
                             "arch": "x64",
                         },
+                        {
+                            "name": "python-311",
+                            "python": "3.11",
+                            "toxenv": "py311",
+                            "arch": "x64",
+                        },
                         {
                             "name": "doc",
                             "python": "3.10",
diff --git a/Makefile b/Makefile
index 7cfaa52..30876fd 100644
--- a/Makefile
+++ b/Makefile
@@ -20,13 +20,14 @@ testlong: export JWCRYPTO_TESTS_ENABLE_MMA=True
 testlong: export TOX_TESTENV_PASSENV=JWCRYPTO_TESTS_ENABLE_MMA
 testlong:
 	rm -f .coverage
-	tox -e py310
+	tox -e py311
 
 test:
 	rm -f .coverage
 	tox -e py38 --skip-missing-interpreter
 	tox -e py39 --skip-missing-interpreter
 	tox -e py310 --skip-missing-interpreter
+	tox -e py311 --skip-missing-interpreter
 
 DOCS_DIR = docs
 .PHONY: docs
diff --git a/setup.py b/setup.py
index 72afb9e..cf55329 100755
--- a/setup.py
+++ b/setup.py
@@ -26,11 +26,10 @@
     long_description=long_description,
     long_description_content_type='text/markdown',
     classifiers = [
-        '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',
+        'Programming Language :: Python :: 3.11',
         'Intended Audience :: Developers',
         'Topic :: Security',
         'Topic :: Software Development :: Libraries :: Python Modules'
@@ -40,5 +39,5 @@
         'cryptography >= 3.4',
         'typing_extensions',
     ],
-    python_requires = '>= 3.6',
+    python_requires = '>= 3.8',
 )
diff --git a/tox.ini b/tox.ini
index d77a003..fee46cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,py36,py37,py38,py39,py310,pep8,doc,sphinx,doctest
+envlist = lint,py38,py39,py310,py311,pep8,doc,sphinx,doctest
 skip_missing_interpreters = true
 
 [testenv]
@@ -16,7 +16,7 @@ commands =
     {envpython} -m coverage report -m
 
 [testenv:lint]
-basepython = python3.10
+basepython = python3.11
 deps =
     pylint
 #sitepackages = True
@@ -24,7 +24,7 @@ commands =
     {envpython} -m pylint -d c,r,i,W0613 -r n -f colorized --notes= --disable=star-args ./jwcrypto
 
 [testenv:pep8]
-basepython = python3.10
+basepython = python3.11
 deps =
     flake8
     flake8-import-order
@@ -37,13 +37,13 @@ deps =
     doc8
     docutils
     markdown
-basepython = python3.10
+basepython = python3.11
 commands =
     doc8 --allow-long-titles README.md
     markdown_py README.md -f {toxworkdir}/README.md.html
 
 [testenv:sphinx]
-basepython = python3.10
+basepython = python3.11
 changedir = docs/source
 deps =
     sphinx
@@ -51,7 +51,7 @@ commands =
     sphinx-build -n -v -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:doctest]
-basepython = python3.10
+basepython = python3.11
 changedir = docs/source
 deps =
     sphinx
@@ -59,7 +59,7 @@ commands =
     sphinx-build -v -W -b doctest -d {envtmpdir}/doctrees . {envtmpdir}/doctest
 
 [testenv:codespell]
-basepython = python3.10
+basepython = python3.11
 deps =
     codespell
 commands =