Skip to content

gh-60283: Check for redefined test names in CI #109161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 12, 2023
Merged

gh-60283: Check for redefined test names in CI #109161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4cd4803
Check for redefined names in CI
hugovk Jun 27, 2023
a37828c
Temporarily exclude files with: F811 Redefinition of unused name
hugovk Sep 8, 2023
0dcdd08
Move Ruff config file to relevant subdirectory to localise rules
hugovk Sep 9, 2023
d14c002
Comment the rule
hugovk Sep 9, 2023
cb8237c
Move autofix setting from pre-commit to Ruff config
hugovk Sep 9, 2023
1bdae72
Show diff and add annotations
hugovk Sep 10, 2023
83904af
Re-order args
hugovk Sep 10, 2023
8fd293a
Remove --diff
hugovk Sep 10, 2023
66e1172
Update config
hugovk Sep 10, 2023
9b1b43a
Don't validate intentionally invalid TOML
hugovk Sep 10, 2023
3839aea
Let tomllib look after its own test files
hugovk Sep 10, 2023
0bf3e3e
Clarify job scope
hugovk Sep 10, 2023
932f2c1
Add colour to test logs for readability
hugovk Sep 11, 2023
0889959
Bump Ruff
hugovk Sep 12, 2023
6ba396d
Remove some exclusions which now parse
hugovk Sep 12, 2023
d9dff8d
Temporarily exclude test_monitoring.py pending fix
hugovk Sep 12, 2023
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

# pre-commit
.pre-commit-config.yaml @hugovk @AlexWaygood
.ruff.toml @hugovk @AlexWaygood

# Build system
configure* @erlend-aasland @corona10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# into the PR branch anyway.
#
# https://github.com/python/core-workflow/issues/373
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo "run_tests=true" >> $GITHUB_OUTPUT || true
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc|^\.pre-commit-config\.yaml$|\.ruff\.toml$)' && echo "run_tests=true" >> $GITHUB_OUTPUT || true
fi

# Check if we should run hypothesis tests
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
permissions:
contents: read

env:
FORCE_COLOR: 1
RUFF_FORMAT: github

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand Down
10 changes: 10 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.288
hooks:
- id: ruff
name: Run Ruff on Lib/test/
args: [--exit-non-zero-on-fix]
files: ^Lib/test/

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-toml
exclude: ^Lib/test/test_tomllib/
- id: check-yaml
- id: end-of-file-fixer
types: [python]
Expand Down
35 changes: 35 additions & 0 deletions Lib/test/.ruff.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
fix = true
select = [
"F811", # Redefinition of unused variable (useful for finding test methods with the same name)
]
extend-exclude = [
# Failed to lint
"badsyntax_pep3120.py",
"encoded_modules/module_iso_8859_1.py",
"encoded_modules/module_koi8_r.py",
# Failed to parse
"badsyntax_3131.py",
"support/socket_helper.py",
"test_fstring.py",
# TODO Fix: F811 Redefinition of unused name
"test__opcode.py",
"test_buffer.py",
"test_ctypes/test_arrays.py",
"test_ctypes/test_functions.py",
"test_dataclasses/__init__.py",
"test_descr.py",
"test_enum.py",
"test_functools.py",
"test_genericclass.py",
"test_grammar.py",
"test_import/__init__.py",
"test_keywordonlyarg.py",
"test_pkg.py",
"test_subclassinit.py",
"test_typing.py",
"test_unittest/testmock/testpatch.py",
"test_yield_from.py",
"time_hashlib.py",
# Pending https://github.com/python/cpython/pull/109139
"test_monitoring.py",
]