Skip to content

Commit fd44326

Browse files
chore(api_core): use ruff for lint and format checks (#17754)
Updates the noxfile to use ruff in place of black, to align with other libraries. Also update codebase to conform to new format For a cleaner diff, look at individual commits
1 parent 9eead95 commit fd44326

77 files changed

Lines changed: 337 additions & 321 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/google-api-core/docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# All configuration values have a default; values that are commented out
2525
# serve to show the default.
2626

27-
import sys
2827
import os
2928
import shlex
29+
import sys
3030

3131
# If extensions (or modules to document with autodoc) are in another directory,
3232
# add these directories to sys.path here. If the directory is relative to the

packages/google-api-core/google/api_core/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
This package contains common code and utilities used by Google client libraries.
1818
"""
1919

20-
from google.api_core import _python_package_support
21-
from google.api_core import _python_version_support
20+
from google.api_core import _python_package_support, _python_version_support
2221
from google.api_core import version as api_core_version
2322

2423
__version__ = api_core_version.__version__

packages/google-api-core/google/api_core/_python_package_support.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
"""Code to check versions of dependencies used by Google Cloud Client Libraries."""
1616

1717
import warnings
18-
from typing import Optional, Tuple
19-
2018
from collections import namedtuple
19+
from importlib import metadata
20+
from typing import Optional, Tuple
2121

2222
from ._python_version_support import (
2323
_flatten_message,
2424
_get_distribution_and_import_packages,
2525
)
2626

27-
from importlib import metadata
28-
2927
ParsedVersion = Tuple[int, ...]
3028

3129
# Here we list all the packages for which we want to issue warnings

packages/google-api-core/google/api_core/_python_version_support.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
import datetime
1818
import enum
1919
import functools
20-
from importlib import metadata
2120
import logging
22-
import warnings
2321
import sys
2422
import textwrap
25-
from typing import Any, List, NamedTuple, Optional, Dict, Tuple
26-
23+
import warnings
24+
from importlib import metadata
25+
from typing import Any, Dict, List, NamedTuple, Optional, Tuple
2726

2827
_LOGGER = logging.getLogger(__name__)
2928

packages/google-api-core/google/api_core/_rest_streaming_base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
"""Helpers for server-side streaming in REST."""
1616

17-
from collections import deque
1817
import string
19-
from typing import Deque, Union
2018
import types
19+
from collections import deque
20+
from typing import Deque, Union
2121

22-
import proto
2322
import google.protobuf.message
23+
import proto
2424
from google.protobuf.json_format import Parse
2525

2626

packages/google-api-core/google/api_core/bidi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def __iter__(self):
113113
except queue_module.Empty:
114114
if not self._is_active():
115115
_LOGGER.debug(
116-
"Empty queue and inactive call, exiting request " "generator."
116+
"Empty queue and inactive call, exiting request generator."
117117
)
118118
return
119119
else:

packages/google-api-core/google/api_core/bidi_async.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
import logging
1919
from typing import Callable, Optional, Union
2020

21+
from google.protobuf.message import Message as ProtobufMessage
2122
from grpc import aio
2223

2324
from google.api_core import exceptions
2425
from google.api_core.bidi_base import BidiRpcBase
2526

26-
from google.protobuf.message import Message as ProtobufMessage
27-
28-
2927
_LOGGER = logging.getLogger(__name__)
3028

3129

packages/google-api-core/google/api_core/client_logging.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import logging
21
import json
2+
import logging
33
import os
4-
54
from typing import List, Optional
65

76
_LOGGING_INITIALIZED = False

packages/google-api-core/google/api_core/client_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def get_client_cert():
4848
4949
"""
5050

51-
from typing import Callable, Mapping, Optional, Sequence, Tuple
5251
import warnings
52+
from typing import Callable, Mapping, Optional, Sequence, Tuple
5353

5454
from google.api_core import general_helpers
5555

packages/google-api-core/google/api_core/datetime_helpers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
from google.protobuf import timestamp_pb2
2222

23-
2423
_UTC_EPOCH = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
2524
_RFC3339_MICROS = "%Y-%m-%dT%H:%M:%S.%fZ"
2625
_RFC3339_NO_FRACTION = "%Y-%m-%dT%H:%M:%S"

0 commit comments

Comments
 (0)