Merge pull request #810 from OpenIDC/python-versions

Drop python 3.6

.github/workflows/python-test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python: [3.6, 3.7, 3.8, 3.9]
+        python: [3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -7,6 +7,11 @@ The format is based on the [KeepAChangeLog] project.
 
 ## Unreleased
 
+### Changed
+- [#810] Drop python 3.6 support
+
+[#810]: https://github.com/OpenIDC/pyoidc/pull/810
+
 ## 1.3.0 [2021-07-09]
 
 ### Changed

appveyor.yml

@@ -1,17 +1,17 @@
+image:
+  - Visual Studio 2019
+
 environment:
   matrix:
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_ARCH: "64"
-    - PYTHON: "C:\\Python37-x64"
-      PYTHON_ARCH: "64"
-    - PYTHON: "C:\\Python38-x64"
-      PYTHON_ARCH: "64"
+    - TOXENV: py37
+    - TOXENV: py38
+    - TOXENV: py39
+    - TOXENV: py310
 
 build: off
 
 install:
-  - "%PYTHON%\\python.exe -m pip install --upgrade pip"
-  - "%PYTHON%\\python.exe -m pip install .[testing]"
+  - py -m pip install --upgrade pip tox
 
 test_script:
-  - "%PYTHON%\\python.exe -m pytest tests/"
+  - py -m tox

setup.py

@@ -68,10 +68,10 @@ def run_tests(self):
     classifiers=[
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
-        "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",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     python_requires='~=3.5',
     extras_require={

tests/utils/test_client_management_run.py

@@ -1,4 +1,3 @@
-import sys
 import tempfile
 from subprocess import PIPE
 from subprocess import STDOUT
@@ -23,13 +22,11 @@ def db_file_path():
 
 
 class TestClientManagementRun(object):
-    @pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
     def test_help_prints_usage_instructions(self):
         result = run(CLI_INVOCATION + "--help", shell=True, stdout=PIPE, stderr=PIPE)
         assert result.stdout.decode().startswith("usage: ")
         assert result.stderr.decode() == ""
 
-    @pytest.mark.xfail(sys.version_info < (3, 6), reason="Deprecation in cryptography")
     def test_list_option_with_empty_db_lists_nothing(self, db_file_path):
         for list_option_form in ("-l", "--list"):
             result = run(

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38},docs,quality
+envlist = py{37,38,39,310},docs,quality
 skip_missing_interpreters = True
 
 [testenv]