Update pre-commit and CircleCI config

Viicos · Viicos · commit fa9f23975109 · 2023-02-19T13:47:37.000+01:00
Update `CircleCI` config, to run `pre-commit` on python&gt;=3.8
Update `pyupgrade` to last version (`3.3.1`)
Update `black` to last version (`23.1.0`) and apply code formatting
Update `isort` to last version (`5.12.0`), fixing build fail with `pre-commit`
Update `flake8` to last version (`6.0.0`)`
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,12 @@ jobs:
       - checkout
       - python/install-packages:
           pkg-manager: pip
-      - run: pre-commit run --all-files
+      - when:
+          condition:
+            not:
+              equal: ["3.7", << parameters.py_version >> ]
+          steps:
+            - run: pre-commit run --all-files
       - run: coverage run -m unittest
       - run: bash <(curl -s https://codecov.io/bash)
       - when:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,20 +1,19 @@
 repos:
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
     - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v1.6.1
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     - id: isort
       args: ["--profile", "black"]
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 23.1.0
     hooks:
       - id: black
         additional_dependencies: ['click<8.1.0']
-
diff --git a/auth0/authentication/delegated.py b/auth0/authentication/delegated.py
@@ -17,7 +17,6 @@ def get_token(
         refresh_token=None,
         scope="openid",
     ):
-
         """Obtain a delegation token."""
 
         if id_token and refresh_token:
diff --git a/auth0/authentication/users.py b/auth0/authentication/users.py
@@ -32,7 +32,6 @@ def __init__(
     """
 
     def userinfo(self, access_token):
-
         """Returns the user information based on the Auth0 access token.
         This endpoint will work only if openid was granted as a scope for the access_token.
 
diff --git a/auth0/test/authentication/test_delegated.py b/auth0/test/authentication/test_delegated.py
@@ -7,7 +7,6 @@
 class TestDelegated(unittest.TestCase):
     @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_id_token(self, mock_post):
-
         d = Delegated("my.domain.com", "cid")
 
         d.get_token(
@@ -35,7 +34,6 @@ def test_get_token_id_token(self, mock_post):
 
     @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_refresh_token(self, mock_post):
-
         d = Delegated("my.domain.com", "cid")
 
         d.get_token(
@@ -62,7 +60,6 @@ def test_get_token_refresh_token(self, mock_post):
 
     @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_value_error(self, mock_post):
-
         d = Delegated("my.domain.com", "cid")
 
         with self.assertRaises(ValueError):
diff --git a/auth0/test/authentication/test_enterprise.py b/auth0/test/authentication/test_enterprise.py
@@ -7,7 +7,6 @@
 class TestEnterprise(unittest.TestCase):
     @mock.patch("auth0.authentication.enterprise.Enterprise.get")
     def test_saml_metadata(self, mock_get):
-
         e = Enterprise("my.domain.com", "cid")
 
         e.saml_metadata()
@@ -16,7 +15,6 @@ def test_saml_metadata(self, mock_get):
 
     @mock.patch("auth0.authentication.enterprise.Enterprise.get")
     def test_wsfed_metadata(self, mock_get):
-
         e = Enterprise("my.domain.com", "cid")
 
         e.wsfed_metadata()
diff --git a/auth0/test/authentication/test_get_token.py b/auth0/test/authentication/test_get_token.py
@@ -22,7 +22,6 @@ def get_private_key():
 class TestGetToken(unittest.TestCase):
     @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code(self, mock_post):
-
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
 
         g.authorization_code(
@@ -47,7 +46,6 @@ def test_authorization_code(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code_with_client_assertion(self, mock_post):
-
         g = GetToken(
             "my.domain.com", "cid", client_assertion_signing_key=get_private_key()
         )
@@ -71,7 +69,6 @@ def test_authorization_code_with_client_assertion(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code_pkce(self, mock_post):
-
         g = GetToken("my.domain.com", "cid")
 
         g.authorization_code_pkce(
@@ -97,7 +94,6 @@ def test_authorization_code_pkce(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_client_credentials(self, mock_post):
-
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
 
         g.client_credentials(audience="aud", grant_type="gt")
@@ -139,7 +135,6 @@ def test_client_credentials_with_client_assertion(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_login(self, mock_post):
-
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
 
         g.login(
@@ -194,7 +189,6 @@ def test_refresh_token(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_passwordless_login_with_sms(self, mock_post):
-
         g = GetToken("my.domain.com", "cid", client_secret="csec")
 
         g.passwordless_login(
diff --git a/auth0/test/authentication/test_passwordless.py b/auth0/test/authentication/test_passwordless.py
@@ -7,7 +7,6 @@
 class TestPasswordless(unittest.TestCase):
     @mock.patch("auth0.rest.RestClient.post")
     def test_send_email(self, mock_post):
-
         p = Passwordless("my.domain.com", "cid")
 
         p.email(email="a@b.com", send="snd")
@@ -27,7 +26,6 @@ def test_send_email(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_send_email_with_auth_params(self, mock_post):
-
         p = Passwordless("my.domain.com", "cid")
 
         p.email(email="a@b.com", send="snd", auth_params={"a": "b"})
@@ -48,7 +46,6 @@ def test_send_email_with_auth_params(self, mock_post):
 
     @mock.patch("auth0.rest.RestClient.post")
     def test_send_email_with_client_secret(self, mock_post):
-
         p = Passwordless("my.domain.com", "cid", client_secret="csecret")
 
         p.email(email="a@b.com", send="snd")
diff --git a/auth0/test/authentication/test_revoke_token.py b/auth0/test/authentication/test_revoke_token.py
@@ -7,7 +7,6 @@
 class TestRevokeToken(unittest.TestCase):
     @mock.patch("auth0.rest.RestClient.post")
     def test_revoke_refresh_token(self, mock_post):
-
         a = RevokeToken("my.domain.com", "cid")
 
         # regular apps
diff --git a/auth0/test/authentication/test_token_verifier.py b/auth0/test/authentication/test_token_verifier.py
@@ -77,7 +77,6 @@ def test_symmetric_verifier_fetches_key(self):
         self.assertEqual(key, "some secret")
 
     def test_asymmetric_verifier_fetches_key(self):
-
         mock_fetcher = JwksFetcher("some URL")
         mock_fetcher.get_key = MagicMock("get_key")
         mock_fetcher.get_key.return_value = RSA_PUB_KEY_1_JWK
diff --git a/auth0/test/authentication/test_users.py b/auth0/test/authentication/test_users.py
@@ -7,7 +7,6 @@
 class TestUsers(unittest.TestCase):
     @mock.patch("auth0.rest.RestClient.get")
     def test_userinfo(self, mock_get):
-
         u = Users("my.domain.com")
 
         u.userinfo(access_token="atk")
