Skip to content

Commit 18aaf51

Browse files
mkrnrmkrnr
authored
Merge branch 'main' into linux-uinput
2 parents 9fbe6b2 + 99ec10b commit 18aaf51

File tree

14 files changed

+119
-105
lines changed

14 files changed

+119
-105
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- First time contributors: Take a moment to review https://github.com/openstenoproject/plover/blob/master/doc/developer_guide.md! -->
1+
<!-- First time contributors: Take a moment to review https://github.com/openstenoproject/plover/blob/main/doc/developer_guide.md! -->
22
<!-- Remove sections if not applicable -->
33

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

1010
### Pull Request Checklist
1111
- [ ] Changes have tests
12-
- [ ] 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
12+
- [ ] 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

‎.github/RELEASE_DRAFT_FILTER.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ return {
1010
release_count = release_count + 1
1111
end
1212
if elem.level < 3 or release_count > 1 then
13-
return pandoc.Null()
13+
return {}
1414
end
1515
return elem
1616
end,
1717
Block = function (elem)
1818
if release_count > 1 then
19-
return pandoc.Null()
19+
return {}
2020
end
2121
return elem
2222
end,

‎.github/workflows/ci.yml‎

Lines changed: 74 additions & 70 deletions
Large diffs are not rendered by default.

‎.github/workflows/ci/helpers.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ EOF
179179
run pandoc --from=gfm --to=gfm \
180180
--lua-filter=.github/RELEASE_DRAFT_FILTER.lua \
181181
--template=.github/RELEASE_DRAFT_TEMPLATE.md \
182-
--base-header-level=2 --wrap=none \
182+
--shift-heading-level-by=2 --wrap=none \
183183
--variable="version:$RELEASE_VERSION" \
184184
--output=notes.md \
185185
"$notes_body" || die

‎.github/workflows/ci/workflow_context.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cache_epoch: 0 # <- increase number to clear cache.
22

3-
action_cache: actions/cache@v3
4-
action_checkout: actions/checkout@v3
5-
action_setup_python: actions/setup-python@v4
6-
action_upload_artifact: actions/upload-artifact@v3
7-
action_download_artifact: actions/download-artifact@v3
3+
action_cache: actions/cache@v4
4+
action_checkout: actions/checkout@v4
5+
action_setup_python: actions/setup-python@v5
6+
action_upload_artifact: actions/upload-artifact@v4
7+
action_download_artifact: actions/download-artifact@v4
88

99
skippy_enabled: true
1010

@@ -13,13 +13,13 @@ vars:
1313
variant: Linux
1414
python: "3.9"
1515
os: Linux
16-
platform: ubuntu-22.04
16+
platform: ubuntu-24.04
1717

1818
- &dist_macos
1919
variant: macOS
2020
python: "3.9"
2121
os: macOS
22-
platform: macos-12
22+
platform: macos-15
2323

2424
- &dist_win
2525
variant: Windows

‎.github/workflows/ci/workflow_template.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ name: CI
33
on:
44
push:
55
branches:
6-
- '*'
6+
- 'main'
77
tags-ignore:
88
# Ignore continuous releases' tag.
99
- 'continuous'
1010
pull_request:
11+
types:
12+
- opened
13+
- reopened
14+
- synchronize
1115

1216
defaults:
1317
run:

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
/steno-notes-*.txt
1515
/strokes.log
1616

17+
# Plover: build artifacts.
18+
news_draft.md
19+
notes.md
20+
1721
# Pytest.
1822
/.pytest_cache/
1923

‎README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</a>
2323
</p>
2424

25-
| [Homepage][] | [Wiki][] | [Blog][] | [Google Group][] |
26-
| ------------ | -------- | -------- | ---------------- |
25+
| [Homepage][] | [Wiki][] | [Blog][] | [Google Group][] | [Discord](https://discord.com/invite/H5HnRE6) |
26+
| ------------ | -------- | -------- | ---------------- | --------------------------------------------- |
2727

2828
- [About](#about)
2929
- [Installation](#installation)
@@ -98,7 +98,7 @@ including [StenoJig][] (JavaScript) and [StenoTray][] (Java).
9898
- The [Plover Wiki][Wiki] discusses Plover and Open Steno in
9999
general. Edits to the Wiki and new page ideas are welcome.
100100
- Graphic art for Plover and stenography in general is always
101-
appreciated. The app's icons are worked on at [morinted/plover\_icons][].
101+
appreciated. The app's icons are worked on at [TheaMorin/plover\_icons][].
102102
You may consider reimagining or reposing [Plover's mascot, Dolores][Mascot].
103103
- UX improvement suggestions are welcome. Plover runs on Windows, Mac,
104104
and Linux, and should be powerful but out of the way, which poses
@@ -119,25 +119,25 @@ Please follow through for your system:
119119
- [Linux][Linux README]
120120
- [Mac][macOS README]
121121

122-
[Beginner's Guide]: https://github.com/openstenoproject/plover/wiki/Beginner's-Guide:-Get-Started-with-Plover
122+
[Beginner's Guide]: https://plover.wiki/index.php/Beginner%27s_Guide
123123
[Blog]: http://plover.stenoknight.com
124-
[Contributing]: https://github.com/openstenoproject/plover/blob/master/CONTRIBUTING.md
124+
[Contributing]: https://github.com/openstenoproject/plover/blob/main/CONTRIBUTING.md
125125
[Donate]: http://www.openstenoproject.org/donate
126126
[Google Group]: https://groups.google.com/forum/#!forum/ploversteno
127127
[Homepage Source]: https://github.com/openstenoproject/plover/tree/gh-pages
128128
[Homepage]: http://opensteno.org/plover
129129
[Issues]: https://github.com/openstenoproject/plover/issues?q=is:issue
130-
[License]: https://github.com/openstenoproject/plover/blob/master/LICENSE.txt
130+
[License]: https://github.com/openstenoproject/plover/blob/main/LICENSE.txt
131131
[Open Steno Project Homepage Source]: https://github.com/openstenoproject/openstenoproject.github.io
132132
[Open Steno Project]: http://opensteno.org
133133
[Mascot]: http://plover.stenoknight.com/2010/10/new-logo.html
134134
[StenoJig]: https://github.com/JoshuaGrams/steno-jig
135135
[StenoTray]: https://github.com/SmackleFunky/StenoTray
136-
[Supported Hardware]: https://github.com/openstenoproject/plover/wiki/Supported-Hardware
137-
[Troubleshooting Common Issues]: https://github.com/openstenoproject/plover/wiki/Troubleshooting:-Common-Issues
138-
[Wiki]: https://github.com/openstenoproject/plover/wiki
139-
[installation guide]: https://github.com/openstenoproject/plover/wiki/Installation-Guide
140-
[morinted/plover\_icons]: https://github.com/morinted/plover_icons
141-
[Windows README]: https://github.com/openstenoproject/plover/blob/master/windows/README.md
142-
[Linux README]: https://github.com/openstenoproject/plover/blob/master/linux/README.md
143-
[macOS README]: https://github.com/openstenoproject/plover/blob/master/osx/README.md
136+
[Supported Hardware]: https://plover.wiki/index.php/Supported_hardware
137+
[Troubleshooting Common Issues]: https://plover.wiki/index.php/Troubleshooting_issues
138+
[Wiki]: https://plover.wiki
139+
[installation guide]: https://plover.wiki/index.php/Installation_Guide
140+
[TheaMorin/plover\_icons]: https://github.com/TheaMorin/plover_icons
141+
[Windows README]: https://github.com/openstenoproject/plover/blob/main/windows/README.md
142+
[Linux README]: https://github.com/openstenoproject/plover/blob/main/linux/README.md
143+
[macOS README]: https://github.com/openstenoproject/plover/blob/main/osx/README.md

‎doc/releases.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Version numbers:
66
- pre-release: `{major}.{minor}.{patch}.{dev|rc}{devel}` (e.g. `4.0.0.dev7`, `4.0.0rc1`, ...)
77

88

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

1111
1. Run `tox -e release_prepare {NEW_VERSION_NUMBER}`.
1212
2. Review the staged changes, check all news fragments in `news.d` were

‎doc/translation_language.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Press the individual number keys.
340340
Press accented letter keys on international layouts.
341341
:::
342342

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

345345
:::{note}
346346
When specifying a key by the name of a symbol that would normally be produced

0 commit comments

Comments
 (0)