Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit cc85178

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(python): drop flake8-import-order in samples noxfile (#704)
Source-Link: googleapis/synthtool@6ed3a83 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 06cca6f commit cc85178

13 files changed

Lines changed: 37 additions & 277 deletions

File tree

‎.github/.OwlBot.lock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8
16+
digest: sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb

‎samples/beam/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -107,22 +107,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
107107
#
108108

109109

110-
def _determine_local_import_names(start_dir: str) -> List[str]:
111-
"""Determines all import names that should be considered "local".
112-
113-
This is used when running the linter to insure that import order is
114-
properly checked.
115-
"""
116-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
117-
return [
118-
basename
119-
for basename, extension in file_ext_pairs
120-
if extension == ".py"
121-
or os.path.isdir(os.path.join(start_dir, basename))
122-
and basename not in ("__pycache__")
123-
]
124-
125-
126110
# Linting with flake8.
127111
#
128112
# We ignore the following rules:
@@ -137,7 +121,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
137121
"--show-source",
138122
"--builtin=gettext",
139123
"--max-complexity=20",
140-
"--import-order-style=google",
141124
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
142125
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
143126
"--max-line-length=88",
@@ -147,14 +130,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
147130
@nox.session
148131
def lint(session: nox.sessions.Session) -> None:
149132
if not TEST_CONFIG["enforce_type_hints"]:
150-
session.install("flake8", "flake8-import-order")
133+
session.install("flake8")
151134
else:
152-
session.install("flake8", "flake8-import-order", "flake8-annotations")
135+
session.install("flake8", "flake8-annotations")
153136

154-
local_names = _determine_local_import_names(".")
155137
args = FLAKE8_COMMON_ARGS + [
156-
"--application-import-names",
157-
",".join(local_names),
158138
".",
159139
]
160140
session.run("flake8", *args)

‎samples/hello/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

‎samples/hello_happybase/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

‎samples/instanceadmin/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

‎samples/metricscaler/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

‎samples/quickstart/noxfile.py‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

0 commit comments

Comments
 (0)