Skip to content

Commit 843695f

Browse files
zaniebindygreg
authored andcommitted
Apply checks
1 parent 47b4cfe commit 843695f

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

build-linux.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import sys
1010
import venv
1111

12-
1312
ROOT = pathlib.Path(os.path.abspath(__file__)).parent
1413
BUILD = ROOT / "build"
1514
VENV = BUILD / "venv.linux"

build-macos.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import sys
1010
import venv
1111

12-
1312
ROOT = pathlib.Path(os.path.abspath(__file__)).parent
1413
BUILD = ROOT / "build"
1514
VENV = BUILD / "venv.macos"

build-windows.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import sys
1010
import venv
1111

12-
1312
ROOT = pathlib.Path(os.path.abspath(__file__)).parent
1413
BUILD = ROOT / "build"
1514
DIST = ROOT / "dist"

check.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import sys
1111
import venv
1212

13-
1413
ROOT = pathlib.Path(os.path.abspath(__file__)).parent
1514
VENV = ROOT / "venv.dev"
1615
PIP = VENV / "bin" / "pip"
@@ -56,8 +55,12 @@ def run():
5655
else:
5756
format_args.append("--check")
5857

59-
check_result = subprocess.run(["ruff", "check"] + check_args, stdout=sys.stdout, stderr=sys.stderr)
60-
format_result = subprocess.run(["ruff", "format"] + format_args, stdout=sys.stdout, stderr=sys.stderr)
58+
check_result = subprocess.run(
59+
["ruff", "check"] + check_args, stdout=sys.stdout, stderr=sys.stderr
60+
)
61+
format_result = subprocess.run(
62+
["ruff", "format"] + format_args, stdout=sys.stdout, stderr=sys.stderr
63+
)
6164

6265
sys.exit(check_result.returncode + format_result.returncode)
6366

cpython-unix/build-main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
55

66
import argparse
7-
import os
87
import multiprocessing
8+
import os
99
import pathlib
1010
import platform
1111
import subprocess

cpython-unix/build.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
from pythonbuild.buildenv import build_environment
2020
from pythonbuild.cpython import (
21+
STDLIB_TEST_PACKAGES,
2122
derive_setup_local,
2223
extension_modules_config,
23-
meets_python_minimum_version,
2424
meets_python_maximum_version,
25+
meets_python_minimum_version,
2526
parse_setup_line,
26-
STDLIB_TEST_PACKAGES,
2727
)
2828
from pythonbuild.docker import build_docker_image, get_image, write_dockerfiles
2929
from pythonbuild.downloads import DOWNLOADS
@@ -34,12 +34,12 @@
3434
clang_toolchain,
3535
create_tar_from_directory,
3636
download_entry,
37-
get_targets,
3837
get_target_settings,
38+
get_targets,
3939
target_needs,
4040
validate_python_json,
41-
write_package_versions,
4241
write_cpython_version,
42+
write_package_versions,
4343
write_target_settings,
4444
write_triples_makefiles,
4545
)
@@ -490,10 +490,10 @@ def python_build_info(
490490
binary_suffix = ""
491491

492492
if platform == "linux64":
493-
bi["core"][
494-
"static_lib"
495-
] = "install/lib/python{version}/config-{version}{binary_suffix}-x86_64-linux-gnu/libpython{version}{binary_suffix}.a".format(
496-
version=version, binary_suffix=binary_suffix
493+
bi["core"]["static_lib"] = (
494+
"install/lib/python{version}/config-{version}{binary_suffix}-x86_64-linux-gnu/libpython{version}{binary_suffix}.a".format(
495+
version=version, binary_suffix=binary_suffix
496+
)
497497
)
498498

499499
if not musl:
@@ -513,10 +513,10 @@ def python_build_info(
513513
else:
514514
object_file_format = "elf"
515515
elif platform == "macos":
516-
bi["core"][
517-
"static_lib"
518-
] = "install/lib/python{version}/config-{version}{binary_suffix}-darwin/libpython{version}{binary_suffix}.a".format(
519-
version=version, binary_suffix=binary_suffix
516+
bi["core"]["static_lib"] = (
517+
"install/lib/python{version}/config-{version}{binary_suffix}-darwin/libpython{version}{binary_suffix}.a".format(
518+
version=version, binary_suffix=binary_suffix
519+
)
520520
)
521521
bi["core"]["shared_lib"] = "install/lib/libpython%s%s.dylib" % (
522522
version,

cpython-windows/build.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import concurrent.futures
88
import io
99
import json
10+
import multiprocessing
1011
import os
1112
import pathlib
1213
import re
@@ -15,20 +16,19 @@
1516
import sys
1617
import tempfile
1718
import zipfile
18-
import multiprocessing
1919

20-
from pythonbuild.downloads import DOWNLOADS
2120
from pythonbuild.cpython import (
22-
parse_config_c,
2321
STDLIB_TEST_PACKAGES,
2422
meets_python_minimum_version,
23+
parse_config_c,
2524
)
25+
from pythonbuild.downloads import DOWNLOADS
2626
from pythonbuild.utils import (
27+
compress_python_archive,
2728
create_tar_from_directory,
2829
download_entry,
2930
extract_tar_to_directory,
3031
extract_zip_to_directory,
31-
compress_python_archive,
3232
normalize_tar_archive,
3333
release_tag_from_git,
3434
validate_python_json,

pythonbuild/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import sys
1818
import tarfile
1919
import time
20-
import zipfile
2120
import urllib.error
2221
import urllib.request
22+
import zipfile
2323

2424
import yaml
2525
import zstandard

src/verify_distribution.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import os
66
import sys
77
import unittest
8-
import io
9-
108

119
TERMINFO_DIRS = [
1210
"/etc/terminfo",
@@ -41,7 +39,9 @@
4139

4240
class TestPythonInterpreter(unittest.TestCase):
4341
def test_compression(self):
44-
import bz2, lzma, zlib
42+
import bz2
43+
import lzma
44+
import zlib
4545

4646
self.assertTrue(lzma.is_check_supported(lzma.CHECK_CRC64))
4747
self.assertTrue(lzma.is_check_supported(lzma.CHECK_SHA256))
@@ -66,6 +66,7 @@ def error_handler(fif, message):
6666
@unittest.skipIf(os.name == "nt", "curses not available on Windows")
6767
def test_curses_import(self):
6868
import curses
69+
6970
assert curses is not None
7071

7172
@unittest.skipIf(os.name == "nt", "curses not available on Windows")

0 commit comments

Comments
 (0)