linting fixes + deps update (#192)

Author: guillp

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     - id: check-merge-conflict
     - id: check-yaml
@@ -13,14 +13,14 @@ repos:
     - id: python-use-type-annotations
     - id: text-unicode-replacement-char
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.7
+    rev: v0.12.12
     hooks:
         - id: ruff-format
-        - id: ruff
+        - id: ruff-check
           args: [ --fix ]
         - id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.17.1
     hooks:
     -   id: mypy
         args:

poetry.lock

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "requests_oauth2client"
-version = "1.7.0"
+version = "1.7.1"
 homepage = "https://github.com/guillp/requests_oauth2client"
 description = "An OAuth2.x client based on `requests`."
 authors = ["Guillaume Pujol <guillp.dev@pm.me>"]
@@ -122,7 +122,7 @@ ignore = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**.py" = ["ARG001", "B018", "D100", "D101", "D102", "D103", "D104", "F821", "PGH005", "PLR0913", "PLR0915", "PLR2004", "S101", "S106", "S113",
+"tests/**.py" = ["ARG001", "B018", "D100", "D101", "D102", "D103", "D104", "F821", "FBT001", "PGH005", "PLR0913", "PLR0915", "PLR2004", "S101", "S106", "S113",
 "PT011", "E501"]
 
 [tool.ruff.lint.pylint]

pyproject.toml

@@ -202,7 +202,7 @@ def request(  # noqa: C901, PLR0913, D417
         method: str,
         path: None | str | bytes | Iterable[str | bytes | int] = None,
         *,
-        params: None | bytes | MutableMapping[str, str] = None,
+        params: None | bytes | MutableMapping[str, Any] = None,
         data: (
             Iterable[bytes]
             | str
@@ -392,6 +392,7 @@ def to_absolute_url(self, path: None | str | bytes | Iterable[str | bytes | int]
     def get(
         self,
         path: None | str | bytes | Iterable[str | bytes | int] = None,
+        *,
         raise_for_status: bool | None = None,
         **kwargs: Any,
     ) -> requests.Response:
@@ -417,6 +418,7 @@ def get(
     def post(
         self,
         path: str | bytes | Iterable[str | bytes] | None = None,
+        *,
         raise_for_status: bool | None = None,
         **kwargs: Any,
     ) -> requests.Response:
@@ -442,6 +444,7 @@ def post(
     def patch(
         self,
         path: str | bytes | Iterable[str | bytes] | None = None,
+        *,
         raise_for_status: bool | None = None,
         **kwargs: Any,
     ) -> requests.Response:
@@ -467,6 +470,7 @@ def patch(
     def put(
         self,
         path: str | bytes | Iterable[str | bytes] | None = None,
+        *,
         raise_for_status: bool | None = None,
         **kwargs: Any,
     ) -> requests.Response:
@@ -492,6 +496,7 @@ def put(
     def delete(
         self,
         path: str | bytes | Iterable[str | bytes] | None = None,
+        *,
         raise_for_status: bool | None = None,
         **kwargs: Any,
     ) -> requests.Response:

requests_oauth2client/api_client.py

@@ -8,6 +8,7 @@
 from attrs import define, field, setters
 from typing_extensions import override
 
+from .device_authorization import DeviceAuthorizationPollingJob
 from .tokens import BearerToken
 
 if TYPE_CHECKING:
@@ -364,8 +365,6 @@ def exchange_device_code_for_token(self) -> None:
         This will poll the Token Endpoint until the user finishes the authorization process.
 
         """
-        from .device_authorization import DeviceAuthorizationPollingJob
-
         if self.device_code:  # pragma: no branch
             polling_job = DeviceAuthorizationPollingJob(
                 client=self.client,

requests_oauth2client/auth.py

@@ -64,7 +64,7 @@ def token(self, token: BearerToken | str | None) -> None:
             session.pop(self.session_key, None)
 
 
-class FlaskOAuth2ClientCredentialsAuth(FlaskSessionAuthMixin, OAuth2ClientCredentialsAuth):  # type: ignore[misc]
+class FlaskOAuth2ClientCredentialsAuth(FlaskSessionAuthMixin, OAuth2ClientCredentialsAuth):
     """A `requests` Auth handler for CC grant that stores its token in Flask session.
 
     It will automatically get Access Tokens from an OAuth 2.x AS with the Client Credentials grant

requests_oauth2client/flask/auth.py

@@ -1,11 +1,13 @@
-# ruff: noqa: PGH003,ANN001,ANN002,ANN003,ANN201,ANN202,ANN204,D101
+# ruff: noqa: PGH003, ANN201
 # type: ignore
 """Test the metaclass used to deprecated things.
 
 https://stackoverflow.com/a/52087847 by
 Kentzo https://stackoverflow.com/users/188530/kentzo
 """
 
+import pytest
+
 from requests_oauth2client.deprecated import _DeprecatedClassMeta
 
 
@@ -21,8 +23,10 @@ class DeprecatedClass(metaclass=_DeprecatedClassMeta):
     _DeprecatedClassMeta__alias = NewClass
 
 
-class DeprecatedClassSubclass(DeprecatedClass):
-    foo = 2
+with pytest.warns(DeprecationWarning, match="renamed"):
+
+    class DeprecatedClassSubclass(DeprecatedClass):
+        foo = 2
 
 
 class DeprecatedClassSubSubclass(DeprecatedClassSubclass):
@@ -39,7 +43,8 @@ def test_deprecating_metaclass():
     assert issubclass(DeprecatedClassSubclass, NewClass)
     assert issubclass(DeprecatedClassSubSubclass, NewClass)
 
-    assert isinstance(DeprecatedClass(), DeprecatedClass)
+    with pytest.warns(DeprecationWarning, match="renamed"):
+        assert isinstance(DeprecatedClass(), DeprecatedClass)
     assert isinstance(DeprecatedClassSubclass(), DeprecatedClass)
     assert isinstance(DeprecatedClassSubSubclass(), DeprecatedClass)
     assert isinstance(NewClass(), DeprecatedClass)
@@ -49,6 +54,7 @@ def test_deprecating_metaclass():
     assert isinstance(DeprecatedClassSubSubclass(), NewClass)
 
     assert NewClass().foo == 1
-    assert DeprecatedClass().foo == 1
+    with pytest.warns(DeprecationWarning, match="renamed"):
+        assert DeprecatedClass().foo == 1
     assert DeprecatedClassSubclass().foo == 2
     assert DeprecatedClassSubSubclass().foo == 3

tests/test_deprecated_metaclass.py

@@ -18,30 +18,26 @@ def test_flask(
     scope: str,
     target_api: str,
 ) -> None:
-    try:
-        from flask import Flask, request
-
-        from requests_oauth2client.flask import FlaskOAuth2ClientCredentialsAuth
-    except ImportError:
-        pytest.skip("Flask is not available")
+    flask = pytest.importorskip("flask")
+    rof = pytest.importorskip("requests_oauth2client.flask")
 
     oauth_client = OAuth2Client(token_endpoint, ClientSecretPost(client_id, client_secret))
-    auth = FlaskOAuth2ClientCredentialsAuth(
+    auth = rof.FlaskOAuth2ClientCredentialsAuth(
         session_key=session_key,
         scope=scope,
         client=oauth_client,
     )
     api_client = ApiClient(target_api, auth=auth)
 
-    assert isinstance(api_client.auth, FlaskOAuth2ClientCredentialsAuth)
+    assert isinstance(api_client.auth, rof.FlaskOAuth2ClientCredentialsAuth)
 
-    app = Flask("testapp")
+    app = flask.Flask("testapp")
     app.config["TESTING"] = True
     app.config["SECRET_KEY"] = "thisissecret"
 
-    @app.route("/api")
+    @app.route("/api")  # type: ignore[misc]
     def get() -> Any:
-        return api_client.get(params=request.args).json()
+        return api_client.get(params=flask.request.args).json()
 
     access_token = "access_token"
     json_resp = {"status": "success"}
@@ -102,19 +98,15 @@ def get() -> Any:
 
 
 def test_flask_token_kwarg() -> None:
-    try:
-        from flask import Flask
-
-        from requests_oauth2client.flask import FlaskOAuth2ClientCredentialsAuth
-    except ImportError:
-        pytest.skip("Flask is not available")
+    flask = pytest.importorskip("flask")
+    rof = pytest.importorskip("requests_oauth2client.flask")
 
-    app = Flask("testapp")
+    app = flask.Flask("testapp")
     app.config["TESTING"] = True
     app.config["SECRET_KEY"] = "thisissecret"
 
     with app.test_request_context("/"):
-        auth = FlaskOAuth2ClientCredentialsAuth(
+        auth = rof.FlaskOAuth2ClientCredentialsAuth(
             client=None,
             session_key=session_key,
             token="xyz",