merge commit

.github/workflows/pull_request.yml

@@ -1,14 +1,14 @@
 on: pull_request
 jobs:
   pre-commit:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.6
+      - name: Setup python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.6
+          python-version: 3.10.14
       - name: Install pre-commit
         run: pip install pre-commit
       - name: Run pre-commit
@@ -36,10 +36,10 @@ jobs:
   #    - name: Run license finder
   #      run: license_finder
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
         matrix:
-          python-version: ['3.6.x', '3.7.x', '3.8.x']
+          python-version: ['3.10.x']
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/push.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build-and-publish-python-module:
     name: Build and publish python module to pypi
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Setup python 3.6
+      - name: Setup python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.6
+          python-version: 3.10.14
       - name: Add wheel dependency
         run: pip install wheel
       - name: Generate dist

.pre-commit-config.yaml

@@ -5,5 +5,5 @@ repos:
     hooks:
     -   id: flake8
         additional_dependencies:
-        -   flake8==3.3.0
-        -   flake8-tidy-imports==1.0.6
+        -   flake8
+        -   flake8-tidy-imports

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.3
+
+* upgrade to python3.10
+
 ## 2.2.0
 
 * remove upper bound for dependency of cryptography

Makefile

@@ -5,4 +5,4 @@ test: test_unit
 
 test_unit:
 	mkdir -p build
-	nosetests tests/unit
+	pytest tests/unit

confidant_client/__init__.py

@@ -936,7 +936,7 @@ def get_certificate_from_csr(self, ca, csr, validity=120):
         try:
             response = self._execute_request(
                 'post',
-                '{0}/v1/certificates/{1}'.format(
+                '{0}/v1/certificates/{1}'.format(  # noqa: F522
                     self.config['url'],
                     ca,
                     data={

requirements.txt

@@ -8,10 +8,9 @@ flake8==2.3.0
 # Upstream url: https://pypi.python.org/pypi/coverage
 coverage==3.7.1
 
-# nose makes testing easier
-# License: GNU Library or Lesser General Public License (LGPL)
-# Upstream url: http://readthedocs.org/docs/nose
-nose==1.3.3
+# License: MIT
+# Upstream url: https://pypi.org/project/pytest/
+pytest
 
 # Mocking and Patching Library for Testing
 # License: BSD

setup.py

@@ -97,13 +97,13 @@
         ],
     },
     classifiers=[
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.10',
     ],
 )

tests/unit/confidant_client/client_test.py

@@ -79,13 +79,13 @@ def test_validate_config(self):
                 # invalid token version
                 token_version=3
             )
-        assert(confidant_client.ConfidantClient(
+        assert (confidant_client.ConfidantClient(
             'http://localhost/',
             'alias/authnz-testing',
             {'from': 'test', 'to': 'test'},
             token_version=1
         ))
-        assert(confidant_client.ConfidantClient(
+        assert (confidant_client.ConfidantClient(
             'http://localhost/',
             'alias/authnz-testing',
             {'from': 'test', 'to': 'test', 'user_type': 'service'}