Replace Black and Isort with Ruff

henribru · Mar 16, 2024 · 5edb8bb · 5edb8bb
1 parent bed7238
commit 5edb8bb
Show file tree

Hide file tree

Showing 494 changed files with 7,308 additions and 8,560 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
 
 jobs:
-  black:
+  ruff-format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -33,12 +33,15 @@ jobs:
         run: poetry install
 
       - name: Register problem matcher
-        run: echo "::add-matcher::.github/workflows/matchers/black.json"
+        run: echo "::add-matcher::.github/workflows/matchers/ruff.json"
 
-      - name: Run Black
-        run: poetry run black --check --diff googleapiclient-stubs apiclient-stubs
+      - name: Delete .gitignore (https://github.com/astral-sh/ruff/issues/8753)
+        run: rm .gitignore              
 
-  isort:
+      - name: Run ruff format
+        run: poetry run ruff format --check googleapiclient-stubs apiclient-stubs
+
+  ruff-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -63,11 +66,11 @@ jobs:
       - name: Install dependencies
         run: poetry install
 
-      - name: Register problem matcher
-        run: echo "::add-matcher::.github/workflows/matchers/isort.json"
+      - name: Delete .gitignore (https://github.com/astral-sh/ruff/issues/8753)
+        run: rm .gitignore        
 
-      - name: Run isort
-        run: poetry run isort --check-only --diff googleapiclient-stubs apiclient-stubs
+      - name: Run ruff check
+        run:  poetry run ruff check --output-format github googleapiclient-stubs apiclient-stubs
 
   mypy:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/matchers/isort.json b/.github/workflows/matchers/isort.json
diff --git a/.github/workflows/matchers/black.json → .github/workflows/matchers/ruff.json b/.github/workflows/matchers/black.json → .github/workflows/matchers/ruff.json
@@ -1,10 +1,10 @@
 {
   "problemMatcher": [
     {
-      "owner": "black",
+      "owner": "ruff",
       "pattern": [
         {
-          "regexp": "^(would reformat) (.+)$",
+          "regexp": "^(Would reformat): (.+)$",
           "message": 1,
           "file": 2
         }

diff --git a/googleapiclient-stubs/_apis/abusiveexperiencereport/v1/resources.pyi b/googleapiclient-stubs/_apis/abusiveexperiencereport/v1/resources.pyi
@@ -25,17 +25,15 @@ class AbusiveExperienceReportResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def sites(self) -> SitesResource: ...
     def violatingSites(self) -> ViolatingSitesResource: ...

diff --git a/googleapiclient-stubs/_apis/acceleratedmobilepageurl/v1/resources.pyi b/googleapiclient-stubs/_apis/acceleratedmobilepageurl/v1/resources.pyi
@@ -21,17 +21,15 @@ class AcceleratedmobilepageurlResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def ampUrls(self) -> AmpUrlsResource: ...
 

diff --git a/googleapiclient-stubs/_apis/accessapproval/v1/resources.pyi b/googleapiclient-stubs/_apis/accessapproval/v1/resources.pyi
@@ -201,17 +201,15 @@ class AccessApprovalResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def folders(self) -> FoldersResource: ...
     def organizations(self) -> OrganizationsResource: ...

diff --git a/googleapiclient-stubs/_apis/accesscontextmanager/v1/resources.pyi b/googleapiclient-stubs/_apis/accesscontextmanager/v1/resources.pyi
@@ -296,17 +296,15 @@ class AccessContextManagerResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accessPolicies(self) -> AccessPoliciesResource: ...
     def operations(self) -> OperationsResource: ...

diff --git a/googleapiclient-stubs/_apis/accesscontextmanager/v1beta/resources.pyi b/googleapiclient-stubs/_apis/accesscontextmanager/v1beta/resources.pyi
@@ -129,17 +129,15 @@ class AccessContextManagerResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accessPolicies(self) -> AccessPoliciesResource: ...
     def operations(self) -> OperationsResource: ...

diff --git a/googleapiclient-stubs/_apis/acmedns/v1/resources.pyi b/googleapiclient-stubs/_apis/acmedns/v1/resources.pyi
@@ -28,17 +28,15 @@ class ACMEDNSResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def acmeChallengeSets(self) -> AcmeChallengeSetsResource: ...
 

diff --git a/googleapiclient-stubs/_apis/adexchangebuyer/v1_2/resources.pyi b/googleapiclient-stubs/_apis/adexchangebuyer/v1_2/resources.pyi
@@ -50,17 +50,15 @@ class AdExchangeBuyerResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accounts(self) -> AccountsResource: ...
     def creatives(self) -> CreativesResource: ...

diff --git a/googleapiclient-stubs/_apis/adexchangebuyer/v1_3/resources.pyi b/googleapiclient-stubs/_apis/adexchangebuyer/v1_3/resources.pyi
@@ -134,17 +134,15 @@ class AdExchangeBuyerResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accounts(self) -> AccountsResource: ...
     def billingInfo(self) -> BillingInfoResource: ...

diff --git a/googleapiclient-stubs/_apis/adexchangebuyer/v1_4/resources.pyi b/googleapiclient-stubs/_apis/adexchangebuyer/v1_4/resources.pyi
@@ -273,17 +273,15 @@ class AdExchangeBuyerResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accounts(self) -> AccountsResource: ...
     def billingInfo(self) -> BillingInfoResource: ...

diff --git a/googleapiclient-stubs/_apis/adexchangebuyer2/v2beta1/resources.pyi b/googleapiclient-stubs/_apis/adexchangebuyer2/v2beta1/resources.pyi
@@ -1011,17 +1011,15 @@ class AdExchangeBuyerIIResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def accounts(self) -> AccountsResource: ...
     def bidders(self) -> BiddersResource: ...

diff --git a/googleapiclient-stubs/_apis/adexperiencereport/v1/resources.pyi b/googleapiclient-stubs/_apis/adexperiencereport/v1/resources.pyi
@@ -25,17 +25,15 @@ class AdExperienceReportResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def sites(self) -> SitesResource: ...
     def violatingSites(self) -> ViolatingSitesResource: ...

diff --git a/googleapiclient-stubs/_apis/admin/datatransfer_v1/resources.pyi b/googleapiclient-stubs/_apis/admin/datatransfer_v1/resources.pyi
@@ -59,17 +59,15 @@ class DataTransferResource(googleapiclient.discovery.Resource):
 
     def new_batch_http_request(
         self,
-        callback: (
-            collections.abc.Callable[
-                [
-                    str,
-                    googleapiclient.http.HttpRequest,
-                    googleapiclient.errors.HttpError | None,
-                ],
-                typing.Any,
-            ]
-            | None
-        ) = None,
+        callback: collections.abc.Callable[
+            [
+                str,
+                googleapiclient.http.HttpRequest,
+                googleapiclient.errors.HttpError | None,
+            ],
+            typing.Any,
+        ]
+        | None = None,
     ) -> googleapiclient.http.BatchHttpRequest: ...
     def applications(self) -> ApplicationsResource: ...
     def transfers(self) -> TransfersResource: ...