Skip to content
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

Jump to bottom

BUG: Fix bug with toml triage #2774

Merged
merged 11 commits into from
Mar 8, 2023
Merged

BUG: Fix bug with toml triage #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15e66e1
BUG: Fix bug with toml triage
larsoner Mar 8, 2023
842a9b1
WIP: Maybe
larsoner Mar 8, 2023
e3d9378
FIX: Name
larsoner Mar 8, 2023
6709bf8
FIX: Another
larsoner Mar 8, 2023
d960a96
FIX: Syntax?
larsoner Mar 8, 2023
a06a3ef
FIX: Syntax
larsoner Mar 8, 2023
599ec27
FIX: Name
larsoner Mar 8, 2023
4eabac7
FIX: Wording
larsoner Mar 8, 2023
1aa1e29
FIX: Missed one
larsoner Mar 8, 2023
d24b03f
FIX: Check
larsoner Mar 8, 2023
551c07a
FIX: Fix bug
larsoner Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/workflows/codespell-private.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# For general usage in your repo, see the example in codespell.yml
# https://github.com/codespell-project/codespell
# Concurrency cancels an action on a given PR once a new commit is pushed
name: Test Codespell
name: Pytest
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
cancel-in-progress: true
Expand All @@ -23,7 +23,12 @@ jobs:
- '3.9'
- '3.10'
- '3.11'
name: Python ${{ matrix.python-version }} test
no-toml:
- ''
include:
- python-version: '3.10'
no-toml: 'no-toml'
name: ${{ matrix.python-version }} ${{ matrix.no-toml }}
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -44,10 +49,14 @@ jobs:
- run: codespell --version
- run: make check
- uses: codecov/codecov-action@v3
- run: codespell --check-filenames --skip="./.git/*,*.pyc,./codespell_lib/tests/test_basic.py,./codespell_lib/data/*,./example/code.c,./build/lib/codespell_lib/tests/test_basic.py,./build/lib/codespell_lib/data/*,README.rst,*.egg-info/*,pyproject-codespell.precommit-toml"
# tomli should not be required for the next two steps (and make sure it's not)
- run: pip uninstall -yq tomli
if: ${{ matrix.no-toml == 'no-toml' }}
- run: codespell --check-filenames --skip="./.git/*,*.pyc,./codespell_lib/tests/test_basic.py,./codespell_lib/data/*,./example/code.c,./build/lib/codespell_lib/tests/test_basic.py,./build/lib/codespell_lib/data/*,README.rst,*.egg-info/*,pyproject-codespell.precommit-toml,./.mypy_cache"
# this file has an error
- run: "! codespell codespell_lib/tests/test_basic.py"


make-check-dictionaries:
runs-on: ubuntu-latest
steps:
Expand Down
10 changes: 6 additions & 4 deletions codespell_lib/_codespell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,12 @@ def parse_options(
f"tomllib or tomli are required to read pyproject.toml "
f"but could not be imported, got: {e}"
) from None
for toml_file in toml_files:
with open(toml_file, "rb") as f:
data = tomllib.load(f).get("tool", {})
config.read_dict(data)
tomllib = None
if tomllib is not None:
for toml_file in toml_files:
with open(toml_file, "rb") as f:
data = tomllib.load(f).get("tool", {})
config.read_dict(data)

# Collect which config files are going to be used
used_cfg_files = []
Expand Down