Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop python 3.6 and 3.7 and add 3.11 support #340

Merged
merged 2 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"fail-fast": false,
"matrix": {
"name": [
"python-37",
"python-38",
"python-39",
"python-310",
"python-311",
"doc",
"doctest",
"sphinx",
Expand All @@ -26,12 +26,6 @@
"codespell",
],
"include": [
{
"name": "python-37",
"python": "3.7",
"toxenv": "py37",
"arch": "x64",
},
{
"name": "python-38",
"python": "3.8",
Expand All @@ -50,39 +44,45 @@
"toxenv": "py310",
"arch": "x64",
},
{
"name": "python-311",
"python": "3.11",
"toxenv": "py311",
"arch": "x64",
},
{
"name": "doc",
"python": "3.10",
"python": "3.11",
"toxenv": "doc",
"arch": "x64",
},
{
"name": "doctest",
"python": "3.10",
"python": "3.11",
"toxenv": "doctest",
"arch": "x64",
},
{
"name": "sphinx",
"python": "3.10",
"python": "3.11",
"toxenv": "sphinx",
"arch": "x64",
},
{
"name": "lint",
"python": "3.10",
"python": "3.11",
"toxenv": "lint",
"arch": "x64",
},
{
"name": "pep8",
"python": "3.10",
"python": "3.11",
"toxenv": "pep8",
"arch": "x64",
},
{
"name": "codespell",
"python": "3.10",
"python": "3.11",
"toxenv": "codespell",
"arch": "x64",
},
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jwcrypto/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.2
1.5.3
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -40,5 +39,5 @@
'cryptography >= 3.4',
'typing_extensions',
],
python_requires = '>= 3.6',
python_requires = '>= 3.8',
)
14 changes: 7 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -16,15 +16,15 @@ commands =
{envpython} -m coverage report -m

[testenv:lint]
basepython = python3.10
basepython = python3.11
deps =
pylint
#sitepackages = True
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
Expand All @@ -37,29 +37,29 @@ 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
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
commands =
sphinx-build -v -W -b doctest -d {envtmpdir}/doctrees . {envtmpdir}/doctest

[testenv:codespell]
basepython = python3.10
basepython = python3.11
deps =
codespell
commands =
Expand Down
Loading