Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/check-style-strict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ jobs:
cache: 'pip'
cache-dependency-path: '.github/workflows/style-requirements.txt'
- run: python -m pip install -r .github/workflows/style-requirements.txt
- run: |
# Report on out-of-date copyright years.
python -m flake8 --select H102 .
- name: Report on out-of-date copyright end years
run: python -m flake8 --select H102 --copyright-end-year current .
2 changes: 1 addition & 1 deletion .github/workflows/style-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
flake8
flake8-ets
flake8-ets >= 1.1.0
6 changes: 0 additions & 6 deletions etstool.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@
#: Default Python version to use.
DEFAULT_RUNTIME = "3.8"

#: Copyright end year expected by the merge-blocking style check. We hard-code
#: this (rather than using the current year) to give us a buffer on CI failures
#: when January 1st rolls around.
EXPECTED_COPYRIGHT_END_YEAR = 2026


def edm_dependencies(runtime):
"""
Expand Down Expand Up @@ -318,7 +313,6 @@ def flake8(edm, runtime, environment):
]
commands = [
"{edm} run -e {environment} -- python -m flake8 "
f"--copyright-end-year {EXPECTED_COPYRIGHT_END_YEAR} "
+ " ".join(targets)
]
execute(commands, parameters)
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[flake8]
ignore = E266, W503
# Pin the year so style checks don't fail when the year rolls over.
copyright-end-year = 2026
per-file-ignores =
*/api.py:F401,
*/__init__.py:F401,
Expand Down
Loading