Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mkrnr authored Jan 31, 2025
2 parents 7dd0718 + 1db0c36 commit 2d0bc7d
Show file tree
Hide file tree
Showing 11 changed files with 105 additions and 93 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- First time contributors: Take a moment to review https://github.com/openstenoproject/plover/blob/master/doc/developer_guide.md! -->
<!-- First time contributors: Take a moment to review https://github.com/openstenoproject/plover/blob/main/doc/developer_guide.md! -->
<!-- Remove sections if not applicable -->

## Summary of changes
Expand All @@ -9,4 +9,4 @@ Closes <!-- issue number here -->

### Pull Request Checklist
- [ ] Changes have tests
- [ ] News fragment added in news.d. See [documentation](https://github.com/openstenoproject/plover/blob/master/doc/developer_guide.md#making-a-pull-request) for details
- [ ] News fragment added in news.d. See [documentation](https://github.com/openstenoproject/plover/blob/main/doc/developer_guide.md#making-a-pull-request) for details
4 changes: 2 additions & 2 deletions .github/RELEASE_DRAFT_FILTER.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ return {
release_count = release_count + 1
end
if elem.level < 3 or release_count > 1 then
return pandoc.Null()
return {}
end
return elem
end,
Block = function (elem)
if release_count > 1 then
return pandoc.Null()
return {}
end
return elem
end,
Expand Down
144 changes: 74 additions & 70 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/ci/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ EOF
run pandoc --from=gfm --to=gfm \
--lua-filter=.github/RELEASE_DRAFT_FILTER.lua \
--template=.github/RELEASE_DRAFT_TEMPLATE.md \
--base-header-level=2 --wrap=none \
--shift-heading-level-by=2 --wrap=none \
--variable="version:$RELEASE_VERSION" \
--output=notes.md \
"$notes_body" || die
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci/workflow_context.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cache_epoch: 0 # <- increase number to clear cache.

action_cache: actions/cache@v3
action_checkout: actions/checkout@v3
action_setup_python: actions/setup-python@v4
action_upload_artifact: actions/upload-artifact@v3
action_download_artifact: actions/download-artifact@v3
action_cache: actions/cache@v4
action_checkout: actions/checkout@v4
action_setup_python: actions/setup-python@v5
action_upload_artifact: actions/upload-artifact@v4
action_download_artifact: actions/download-artifact@v4

skippy_enabled: true

Expand All @@ -13,13 +13,13 @@ vars:
variant: Linux
python: "3.9"
os: Linux
platform: ubuntu-22.04
platform: ubuntu-24.04

- &dist_macos
variant: macOS
python: "3.9"
os: macOS
platform: macos-12
platform: macos-15

- &dist_win
variant: Windows
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci/workflow_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ name: CI
on:
push:
branches:
- '*'
- 'main'
tags-ignore:
# Ignore continuous releases' tag.
- 'continuous'
pull_request:
types:
- opened
- reopened
- synchronize

defaults:
run:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
/steno-notes-*.txt
/strokes.log

# Plover: build artifacts.
news_draft.md
notes.md

# Pytest.
/.pytest_cache/

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ Please follow through for your system:

[Beginner's Guide]: https://github.com/openstenoproject/plover/wiki/Beginner's-Guide:-Get-Started-with-Plover
[Blog]: http://plover.stenoknight.com
[Contributing]: https://github.com/openstenoproject/plover/blob/master/CONTRIBUTING.md
[Contributing]: https://github.com/openstenoproject/plover/blob/main/CONTRIBUTING.md
[Donate]: http://www.openstenoproject.org/donate
[Google Group]: https://groups.google.com/forum/#!forum/ploversteno
[Homepage Source]: https://github.com/openstenoproject/plover/tree/gh-pages
[Homepage]: http://opensteno.org/plover
[Issues]: https://github.com/openstenoproject/plover/issues?q=is:issue
[License]: https://github.com/openstenoproject/plover/blob/master/LICENSE.txt
[License]: https://github.com/openstenoproject/plover/blob/main/LICENSE.txt
[Open Steno Project Homepage Source]: https://github.com/openstenoproject/openstenoproject.github.io
[Open Steno Project]: http://opensteno.org
[Mascot]: http://plover.stenoknight.com/2010/10/new-logo.html
Expand All @@ -138,6 +138,6 @@ Please follow through for your system:
[Wiki]: https://github.com/openstenoproject/plover/wiki
[installation guide]: https://github.com/openstenoproject/plover/wiki/Installation-Guide
[morinted/plover\_icons]: https://github.com/morinted/plover_icons
[Windows README]: https://github.com/openstenoproject/plover/blob/master/windows/README.md
[Linux README]: https://github.com/openstenoproject/plover/blob/master/linux/README.md
[macOS README]: https://github.com/openstenoproject/plover/blob/master/osx/README.md
[Windows README]: https://github.com/openstenoproject/plover/blob/main/windows/README.md
[Linux README]: https://github.com/openstenoproject/plover/blob/main/linux/README.md
[macOS README]: https://github.com/openstenoproject/plover/blob/main/osx/README.md
2 changes: 1 addition & 1 deletion doc/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Version numbers:
- pre-release: `{major}.{minor}.{patch}.{dev|rc}{devel}` (e.g. `4.0.0.dev7`, `4.0.0rc1`, ...)


Steps to cut a new release (from a clean checkout of `master`):
Steps to cut a new release (from a clean checkout of `main`):

1. Run `tox -e release_prepare {NEW_VERSION_NUMBER}`.
2. Review the staged changes, check all news fragments in `news.d` were
Expand Down
2 changes: 1 addition & 1 deletion doc/translation_language.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ Press the individual number keys.
Press accented letter keys on international layouts.
:::

All possible keys are defined in the [Plover codebase](https://github.com/openstenoproject/plover/blob/master/plover/key_combo.py#L21).
All possible keys are defined in the [Plover codebase](https://github.com/openstenoproject/plover/blob/main/plover/key_combo.py#L21).

:::{note}
When specifying a key by the name of a symbol that would normally be produced
Expand Down
6 changes: 3 additions & 3 deletions reqs/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mock==4.0.3
packaging==21.0
pep517==0.12.0
pip==21.3.1
pkginfo==1.7.1
pkginfo==1.8.1
plover-plugins-manager==0.7.0
plover-stroke==1.1.0
plover-treal==1.0.1
Expand Down Expand Up @@ -65,9 +65,9 @@ setuptools==58.3.0
six==1.16.0
toml==0.10.2
tomli==1.2.2
towncrier==21.3.0
towncrier==24.8.0
tqdm==4.62.3
twine==3.4.2
twine==3.7.0
url-normalize==1.4.3
urllib3==1.26.7
wcwidth==0.2.5
Expand Down

0 comments on commit 2d0bc7d

Please sign in to comment.