Skip to content

Commit d8440f1

Browse files
authored
ENH: Use yaml anchors for pre-commit hooks additional dependencies (#44177)
* ENH: Use yaml anchors for pre-commit hooks additional dependencies * ENH: add flake8 to env additonal deps
1 parent 82f5395 commit d8440f1

File tree

2 files changed

+7
-34
lines changed

2 files changed

+7
-34
lines changed

.pre-commit-config.yaml

+6-9
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ repos:
3939
rev: 3.9.2
4040
hooks:
4141
- id: flake8
42-
additional_dependencies:
43-
- flake8-comprehensions==3.1.0
44-
- flake8-bugbear==21.3.2
45-
- pandas-dev-flaker==0.2.0
42+
additional_dependencies: &flake8_dependencies
43+
- flake8==3.9.2
44+
- flake8-comprehensions==3.1.0
45+
- flake8-bugbear==21.3.2
46+
- pandas-dev-flaker==0.2.0
4647
- id: flake8
4748
alias: flake8-cython
4849
name: flake8 (cython)
@@ -76,11 +77,7 @@ repos:
7677
rev: v1.2.3
7778
hooks:
7879
- id: yesqa
79-
additional_dependencies:
80-
- flake8==3.9.2
81-
- flake8-comprehensions==3.1.0
82-
- flake8-bugbear==21.3.2
83-
- pandas-dev-flaker==0.2.0
80+
additional_dependencies: *flake8_dependencies
8481
- repo: local
8582
hooks:
8683
- id: pyright

scripts/sync_flake8_versions.py

+1-25
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,9 @@ def _conda_to_pip_compat(dep):
6868

6969
def _validate_additional_dependencies(
7070
flake8_additional_dependencies,
71-
yesqa_additional_dependencies,
7271
environment_additional_dependencies,
7372
) -> None:
7473
for dep in flake8_additional_dependencies:
75-
if dep not in yesqa_additional_dependencies:
76-
sys.stdout.write(
77-
f"Mismatch of '{dep.name}' version between 'flake8' "
78-
"and 'yesqa' in '.pre-commit-config.yaml'\n"
79-
)
80-
sys.exit(1)
8174
if dep not in environment_additional_dependencies:
8275
sys.stdout.write(
8376
f"Mismatch of '{dep.name}' version between 'enviroment.yml' "
@@ -94,13 +87,6 @@ def _validate_revisions(revisions):
9487
)
9588
sys.exit(1)
9689

97-
if revisions.yesqa != revisions.pre_commit:
98-
sys.stdout.write(
99-
f"{revisions.name} in 'yesqa' does not match "
100-
"in 'flake8' from 'pre-commit'\n"
101-
)
102-
sys.exit(1)
103-
10490

10591
def _process_dependencies(deps):
10692
for dep in deps:
@@ -130,29 +116,19 @@ def get_revisions(
130116
else:
131117
flake8_additional_dependencies.append(dep)
132118

133-
_, yesqa_hook = _get_repo_hook(repos, "yesqa")
134-
yesqa_additional_dependencies = []
135-
for dep in _process_dependencies(yesqa_hook.get("additional_dependencies", [])):
136-
if dep.name == "flake8":
137-
flake8_revisions.yesqa = dep
138-
elif dep.name == "pandas-dev-flaker":
139-
pandas_dev_flaker_revisions.yesqa = dep
140-
else:
141-
yesqa_additional_dependencies.append(dep)
142-
143119
environment_dependencies = environment["dependencies"]
144120
environment_additional_dependencies = []
145121
for dep in _process_dependencies(environment_dependencies):
146122
if dep.name == "flake8":
147123
flake8_revisions.environment = dep
124+
environment_additional_dependencies.append(dep)
148125
elif dep.name == "pandas-dev-flaker":
149126
pandas_dev_flaker_revisions.environment = dep
150127
else:
151128
environment_additional_dependencies.append(dep)
152129

153130
_validate_additional_dependencies(
154131
flake8_additional_dependencies,
155-
yesqa_additional_dependencies,
156132
environment_additional_dependencies,
157133
)
158134

0 commit comments

Comments
 (0)