Skip to content

Commit 855dfad

Browse files
juangugitMongoDB Bot
authored andcommitted
SERVER-94077 Use isort in Ruff configs (#27865)
GitOrigin-RevId: e793d66
1 parent a35c18f commit 855dfad

File tree

328 files changed

+844
-782
lines changed

Some content is hidden

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

328 files changed

+844
-782
lines changed

SConstruct

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import errno
66
import functools
77
import json
88
import os
9-
import re
109
import pathlib
1110
import platform
11+
import re
1212
import shlex
1313
import shutil
1414
import subprocess
@@ -18,11 +18,11 @@ import uuid
1818
from datetime import datetime
1919
from glob import glob
2020

21-
from pkg_resources import parse_version
22-
2321
import SCons
2422
import SCons.Script
2523
from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
24+
from pkg_resources import parse_version
25+
2626
from site_scons.mongo import build_profiles
2727

2828
# This must be first, even before EnsureSConsVersion, if
@@ -32,10 +32,10 @@ DefaultEnvironment(tools=[])
3232
# These come from site_scons/mongo. Import these things
3333
# after calling DefaultEnvironment, for the sake of paranoia.
3434
import mongo
35-
import mongo.platform as mongo_platform
36-
import mongo.toolchain as mongo_toolchain
3735
import mongo.generators as mongo_generators
3836
import mongo.install_actions as install_actions
37+
import mongo.platform as mongo_platform
38+
import mongo.toolchain as mongo_toolchain
3939

4040
EnsurePythonVersion(3, 10)
4141
EnsureSConsVersion(3, 1, 1)
@@ -51,10 +51,10 @@ def release_target_info_noop(self):
5151

5252
SCons.Node.FS.File.release_target_info = release_target_info_noop
5353

54-
from buildscripts import utils
55-
from buildscripts import moduleconfig
5654
import psutil
5755

56+
from buildscripts import moduleconfig, utils
57+
5858
scons_invocation = "{} {}".format(sys.executable, " ".join(sys.argv))
5959
print("scons: running with args {}".format(scons_invocation))
6060

@@ -1669,6 +1669,7 @@ SConsignFile(str(sconsDataDir.File("sconsign.py3")))
16691669

16701670
def printLocalInfo():
16711671
import sys
1672+
16721673
import SCons
16731674

16741675
print(("scons version: " + SCons.__version__))

bazel/config/generate_config_header.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# --output-path mongo.h --template-path mongo.h.in \
77
# --check-path mongo_checks.py --log-path mongo.h.log
88
import argparse
9-
import textwrap
109
import inspect
11-
from typing import Dict
12-
import sys
1310
import os
11+
import sys
12+
import textwrap
13+
from typing import Dict
1414

1515

1616
def write_config_header(input_path: str, output_path: str, definitions: Dict[str, str]) -> None:

bazel/coverity/generate_coverity_command.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import io
12
import os
2-
import sys
33
import subprocess
4-
import io
4+
import sys
55

66
# assume we are always running from project root to find buildscripts
77
sys.path.append(".")

bazel/platforms/remote_execution_containers_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# the dockerfiles listed in bazel/remote_execution_container/.
33

44
import argparse
5-
from datetime import datetime
65
import os
76
import pathlib
87
import subprocess
8+
from datetime import datetime
99

1010

1111
def log_subprocess_run(*args, **kwargs):

buildscripts/aggregate_tracefiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
The last argument is the tracefile to which the output will be written.
66
"""
77

8-
import subprocess
98
import os
9+
import subprocess
1010
import sys
1111
from optparse import OptionParser
1212

buildscripts/antithesis/topologies/sharded_cluster/scripts/mongos_init.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import json
44
import subprocess
55
from time import sleep
6+
67
from utils import mongo_process_running, retry_until_success
78

89
CONFIGSVR_CONFIG = {

buildscripts/apply_clang_tidy_fixes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"""Applies fixes, generated by clang-tidy, across the codebase."""
33

44
import argparse
5+
import hashlib
56
import json
67
import os
7-
import hashlib
88

99

1010
def get_replacements_for_file(filepath: str, file_data: dict, fixes: dict):

buildscripts/bazel_scons_diff.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import re
99
import subprocess
1010
import sys
11+
1112
from buildscripts.install_bazel import install_bazel
1213

1314
bazel_env_settings: dict[str, str] = {}

buildscripts/buildifier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import platform
66
import subprocess
77

8-
from simple_report import put_report, try_combine_reports, make_report
98
import download_buildifier
9+
from simple_report import make_report, put_report, try_combine_reports
1010

1111
mongo_dir = pathlib.Path(__file__).parents[1]
1212

buildscripts/burn_in_tests.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,21 @@
2525
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
2626

2727
# pylint: disable=wrong-import-position
28-
from buildscripts.patch_builds.change_data import (
29-
generate_revision_map,
30-
RevisionMap,
31-
find_changed_files_in_repos,
32-
)
3328
import buildscripts.resmokelib.parser
34-
from buildscripts.resmokelib.suitesconfig import create_test_membership_map, get_suites
35-
from buildscripts.resmokelib.utils import default_if_none, globstar
3629
from buildscripts.ciconfig.evergreen import (
37-
parse_evergreen_file,
3830
EvergreenProjectConfig,
3931
Variant,
4032
VariantTask,
33+
parse_evergreen_file,
4134
)
35+
from buildscripts.patch_builds.change_data import (
36+
RevisionMap,
37+
find_changed_files_in_repos,
38+
generate_revision_map,
39+
)
40+
from buildscripts.resmokelib.suitesconfig import create_test_membership_map, get_suites
41+
from buildscripts.resmokelib.utils import default_if_none, globstar
42+
4243
# pylint: enable=wrong-import-position
4344

4445
structlog.configure(logger_factory=LoggerFactory())

0 commit comments

Comments
 (0)