Update pre-commit hooks

- Don't run pre-commit on Py <= 3.6
- Remove unavailable python versions from Actions

.github/workflows/build.yml

@@ -19,10 +19,11 @@ jobs:
           - os: windows-latest
             python: pypy3
           - os: windows-latest
-            architecture: x86
-            python: '3.10'
+            python: '3.6'
           - os: macos-latest
             python: pypy3
+          - os: macos-latest
+            python: '3.6'
 
     name: ${{ matrix.os }} Py ${{ matrix.python }} ${{ matrix.architecture }}
     steps:
@@ -40,7 +41,7 @@ jobs:
           poetry update
 
       - name: Run pre-commit
-        if: "!startsWith(matrix.python, 'pypy')"
+        if: "!startsWith(matrix.python, 'pypy') && matrix.python != '3.6'"
         run: |
           python -m pip install pre-commit
           pre-commit run --all-files

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.2
     hooks:
     -   id: flake8
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/bandit
-    rev: 1.7.0
+    rev: 1.7.2
     hooks:
     -   id: bandit
         exclude: ^tests/
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.931
     hooks:
     -   id: mypy
         files: ^fido2/

fido2/attestation/tpm.py

@@ -261,7 +261,7 @@ class TpmsRsaParms:
         exponent = reader.unpack("!L")
         if exponent == 0:
             # When  zero,  indicates  that  the  exponent  is  the  default  of 2^16 + 1
-            exponent = (2 ** 16) + 1
+            exponent = (2**16) + 1
 
         return cls(symmetric, scheme, key_bits, exponent)
 
@@ -383,7 +383,7 @@ class ATTRIBUTES(IntEnum):
         | (1 << 3)  # 3 Reserved
         | (0x3 << 8)  # 9:8 Reserved
         | (0xF << 12)  # 15:12 Reserved
-        | ((0xFFFFFFFF << 19) & (2 ** 32 - 1))  # 31:19 Reserved
+        | ((0xFFFFFFFF << 19) & (2**32 - 1))  # 31:19 Reserved
     )
 
 

fido2/win_api.py

@@ -90,10 +90,10 @@ class GUID(ctypes.Structure):
             self.Data2,
             self.Data3,
             self.Data4[0] * 256 + self.Data4[1],
-            self.Data4[2] * (256 ** 5)
-            + self.Data4[3] * (256 ** 4)
-            + self.Data4[4] * (256 ** 3)
-            + self.Data4[5] * (256 ** 2)
+            self.Data4[2] * (256**5)
+            + self.Data4[3] * (256**4)
+            + self.Data4[4] * (256**3)
+            + self.Data4[5] * (256**2)
             + self.Data4[6] * 256
             + self.Data4[7],
         )

tests/test_utils.py

@@ -79,14 +79,14 @@ class TestWebSafe(unittest.TestCase):
         self.assertEqual(websafe_decode(b"Zm9vYmFy"), b"foobar")
 
     def test_websafe_decode_unicode(self):
-        self.assertEqual(websafe_decode(u""), b"")
-        self.assertEqual(websafe_decode(u"Zm9vYmFy"), b"foobar")
+        self.assertEqual(websafe_decode(""), b"")
+        self.assertEqual(websafe_decode("Zm9vYmFy"), b"foobar")
 
     def test_websafe_encode(self):
-        self.assertEqual(websafe_encode(b""), u"")
-        self.assertEqual(websafe_encode(b"f"), u"Zg")
-        self.assertEqual(websafe_encode(b"fo"), u"Zm8")
-        self.assertEqual(websafe_encode(b"foo"), u"Zm9v")
-        self.assertEqual(websafe_encode(b"foob"), u"Zm9vYg")
-        self.assertEqual(websafe_encode(b"fooba"), u"Zm9vYmE")
-        self.assertEqual(websafe_encode(b"foobar"), u"Zm9vYmFy")
+        self.assertEqual(websafe_encode(b""), "")
+        self.assertEqual(websafe_encode(b"f"), "Zg")
+        self.assertEqual(websafe_encode(b"fo"), "Zm8")
+        self.assertEqual(websafe_encode(b"foo"), "Zm9v")
+        self.assertEqual(websafe_encode(b"foob"), "Zm9vYg")
+        self.assertEqual(websafe_encode(b"fooba"), "Zm9vYmE")
+        self.assertEqual(websafe_encode(b"foobar"), "Zm9vYmFy")