Skip to content

Commit b2df9f8

Browse files
authored
Merge branch 'trunk' into 746-reproducible-build-source-date-epoch
2 parents dc07055 + 3f8d54e commit b2df9f8

11 files changed

Lines changed: 28 additions & 11 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ jobs:
172172
run: nox -e typecheck
173173
run-if: true
174174

175+
- name: Check spelling
176+
run: nox -e codespell
177+
run-if: true
178+
175179
steps:
176180
- uses: actions/checkout@v3
177181
with:
@@ -196,7 +200,7 @@ jobs:
196200
- name: Check
197201
run: |
198202
${{ matrix.task.run }}
199-
if: ${{ matrix.task.run-if }}
203+
if: ${{ !cancelled() && matrix.task.run-if }}
200204

201205

202206
pre-commit:

‎NEWS.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Bugfixes
7474
- The template file is now ignored based only on the file name. (`#638 <https://github.com/twisted/towncrier/issues/638>`_)
7575
- Control of the header formatting is once again completely up to the user when they are writing markdown files (fixes a regression introduced in [#610](https://github.com/twisted/towncrier/pull/610)). (`#651 <https://github.com/twisted/towncrier/issues/651>`_)
7676
- Fixed an issue where `issue_template` failed recognizing the issue name of files with a non-category suffix (`.md`) (`#654 <https://github.com/twisted/towncrier/issues/654>`_)
77-
- Fixed a bug where orphan news fragments (e.g. +abc1234.feature) would fail when an `issue_pattern` is configured. Orphan news fragments are now excempt from `issue_pattern` checks. (`#655 <https://github.com/twisted/towncrier/issues/655>`_)
77+
- Fixed a bug where orphan news fragments (e.g. +abc1234.feature) would fail when an `issue_pattern` is configured. Orphan news fragments are now exempt from `issue_pattern` checks. (`#655 <https://github.com/twisted/towncrier/issues/655>`_)
7878

7979

8080
Deprecations and Removals
@@ -501,7 +501,7 @@ towncrier 19.2.0 (2019-02-15)
501501
Features
502502
--------
503503

504-
- Add support for multiple fragements per issue/type pair. This extends the
504+
- Add support for multiple fragments per issue/type pair. This extends the
505505
naming pattern of the fragments to `issuenumber.type(.counter)` where counter
506506
is an optional integer. (`#119 <https://github.com/twisted/towncrier/issues/119>`_)
507507
- Python 2.7 is now supported. (`#121 <https://github.com/twisted/towncrier/issues/121>`_)
@@ -621,7 +621,7 @@ Bugfixes
621621
Features
622622
--------
623623

624-
- Allow configration of the template file, title text and "magic comment" (#35)
624+
- Allow configuration of the template file, title text and "magic comment" (#35)
625625
- Towncrier now uses pyproject.toml, as defined in PEP-518. (#40)
626626

627627

‎docs/configuration.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Top level keys
153153
``issue_pattern``
154154
Ensure the issue name (file name excluding the category and suffix) matches a certain regex pattern.
155155
Make sure to use escape characters properly (e.g. "\\d+" for digit-only file names).
156-
When emptry (``""``), all issue names will be considered valid.
156+
When empty (``""``), all issue names will be considered valid.
157157

158158
``""`` by default.
159159

‎noxfile.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ def typecheck(session: nox.Session) -> None:
6969
session.run("mypy", "src")
7070

7171

72+
@nox.session
73+
def codespell(session: nox.Session) -> None:
74+
session.install(".", "codespell")
75+
session.run("codespell")
76+
77+
7278
@nox.session
7379
def docs(session: nox.Session) -> None:
7480
session.install(".[dev]")

‎pyproject.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dev = [
4444
"furo >= 2024.05.06",
4545
"twisted",
4646
"nox",
47+
"codespell >= 2.4"
4748
]
4849

4950
[project.scripts]
@@ -162,3 +163,9 @@ omit = [
162163
"src/towncrier/test/*",
163164
"src/towncrier/click_default_group.py",
164165
]
166+
167+
[tool.codespell]
168+
skip = 'venv*, .venv*, .nox*, .git*, dist*'
169+
count = false
170+
quiet-level = 3
171+
check-hidden = true

‎src/towncrier/_builder.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def find_fragments(
112112
strict: bool,
113113
) -> tuple[Mapping[str, Mapping[tuple[str, str, int], str]], list[tuple[str, str]]]:
114114
"""
115-
Sections are a dictonary of section names to paths.
115+
Sections are a dictionary of section names to paths.
116116
117117
If strict, raise ClickException if any fragments have an invalid name.
118118
"""

‎src/towncrier/_shell.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""
55
Entry point of the command line interface.
66
7-
Each sub-command has its separate CLI definition andd help messages.
7+
Each sub-command has its separate CLI definition and help messages.
88
"""
99

1010
from __future__ import annotations

‎src/towncrier/newsfragments/747.misc‎

Whitespace-only changes.

‎src/towncrier/test/test_build.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ def do_build_once_with(version, fragment_file, fragment):
889889
[
890890
"[tool.towncrier]",
891891
" single_file=true",
892-
" # The `filename` variable is fixed and not formated in any way.",
892+
" # The `filename` variable is fixed and not formatted in any way.",
893893
' filename="{version}-notes.rst"',
894894
]
895895
)
@@ -1625,7 +1625,7 @@ def test_orphans_in_non_showcontent_markdown(self, runner):
16251625
def test_uncommitted_files(self, runner, commit):
16261626
"""
16271627
At build time, it will delete any fragment file regardless of its stage,
1628-
included files that are not part of the git reporsitory,
1628+
included files that are not part of the git repository,
16291629
or are just staged or modified.
16301630
"""
16311631
# 123 is committed, 124 is modified, 125 is just added, 126 is unknown

‎src/towncrier/test/test_format.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def test_basic(self):
173173

174174
def test_markdown(self):
175175
"""
176-
Check formating of default markdown template.
176+
Check formatting of default markdown template.
177177
"""
178178
fragments = {
179179
"": {

0 commit comments

Comments
 (0)