Skip to content

Commit 89240dc

Browse files
authored
Merge branch 'main' into ignore-words-case-sensitive-option
2 parents 817e97f + f245786 commit 89240dc

File tree

7 files changed

+109
-43
lines changed

7 files changed

+109
-43
lines changed

.github/workflows/codespell-windows.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/codespell-private.yml renamed to .github/workflows/tests.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ permissions: {}
1111
jobs:
1212
test:
1313
env:
14-
REQUIRE_ASPELL: true
14+
REQUIRE_ASPELL: ${{ startsWith(matrix.os, 'ubuntu') }}
1515
RUFF_OUTPUT_FORMAT: github
1616
# Make sure we're using the latest aspell dictionary
17-
runs-on: ubuntu-24.04-arm
17+
runs-on: ${{ matrix.os }}
1818
timeout-minutes: 10
1919
strategy:
2020
fail-fast: false
@@ -26,12 +26,18 @@ jobs:
2626
- "3.11"
2727
- "3.12"
2828
- "3.13"
29-
no-toml:
30-
- ""
29+
kind:
30+
- "standard"
31+
os:
32+
- "ubuntu-24.04-arm"
3133
include:
3234
- python-version: "3.10"
33-
no-toml: "no-toml"
34-
name: ${{ matrix.python-version }} ${{ matrix.no-toml }}
35+
kind: "no-toml"
36+
os: "ubuntu-24.04-arm"
37+
- python-version: "3.13"
38+
kind: "standard"
39+
os: "windows-latest"
40+
name: "${{ matrix.python-version }} ${{ matrix.kind }} ${{ matrix.os }}"
3541
steps:
3642
- uses: actions/checkout@v4
3743
with:
@@ -42,25 +48,32 @@ jobs:
4248
python-version: ${{ matrix.python-version }}
4349
allow-prereleases: true
4450
- run: sudo apt-get install libaspell-dev aspell-en
51+
if: startsWith(matrix.os, 'ubuntu')
4552
- name: Install dependencies
53+
shell: bash -e {0}
4654
run: |
4755
python --version # just to check
4856
pip install --upgrade pip wheel # upgrade to latest pip find 3.5 wheels; wheel to avoid errors
4957
pip install --upgrade "setuptools!=47.2.0" docutils setuptools_scm[toml] twine
50-
pip install aspell-python-py3
5158
pip install -e ".[dev]" # install the codespell dev packages
59+
- run: pip install aspell-python-py3
60+
if: startsWith(matrix.os, 'ubuntu')
5261
- run: codespell --help
5362
- run: codespell --version
5463
- run: make check
64+
if: startsWith(matrix.os, 'ubuntu')
65+
- run: pytest codespell_lib
66+
if: startsWith(matrix.os, 'windows')
5567
- uses: codecov/codecov-action@v5
5668
with:
5769
token: ${{ secrets.CODECOV_TOKEN }}
5870
# tomli should not be required for the next two steps (and make sure it's not)
5971
- run: pip uninstall -yq tomli
60-
if: ${{ matrix.no-toml == 'no-toml' }}
72+
if: ${{ matrix.kind == 'no-toml' }}
6173
- run: codespell --check-filenames --skip="./.*,./build/*,./codespell_lib/data/*,./codespell_lib/tests/test_basic.py,./example/code.c,./junit-results.xml,*.egg-info/*,*.pyc,*.sig,pyproject-codespell.precommit-toml,README.rst,"
6274
# this file has an error
6375
- run: "! codespell codespell_lib/tests/test_basic.py"
76+
shell: bash -e {0}
6477

6578
make-check-dictionaries:
6679
runs-on: ubuntu-latest

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ repos:
5858
- -d
5959
- "{extends: relaxed, rules: {line-length: {max: 90}}}"
6060
- repo: https://github.com/astral-sh/ruff-pre-commit
61-
rev: v0.9.4
61+
rev: v0.9.9
6262
hooks:
6363
- id: ruff
6464
- id: ruff-format
@@ -79,7 +79,7 @@ repos:
7979
hooks:
8080
- id: validate-pyproject
8181
- repo: https://github.com/pre-commit/mirrors-mypy
82-
rev: v1.14.1
82+
rev: v1.15.0
8383
hooks:
8484
- id: mypy
8585
args: ["--config-file", "pyproject.toml"]

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ codespell also works with `pre-commit <https://pre-commit.com/>`_, using
240240
.. code-block:: yaml
241241
242242
- repo: https://github.com/codespell-project/codespell
243-
rev: v2.2.4
243+
rev: v2.4.1
244244
hooks:
245245
- id: codespell
246246
@@ -249,7 +249,7 @@ If one configures codespell using the `pyproject.toml` file instead use:
249249
.. code-block:: yaml
250250
251251
- repo: https://github.com/codespell-project/codespell
252-
rev: v2.2.4
252+
rev: v2.4.1
253253
hooks:
254254
- id: codespell
255255
additional_dependencies:

0 commit comments

Comments
 (0)