Skip to content

Commit 365f969

Browse files
committed
Merge remote-tracking branch 'origin/main' into pyqt6-migration
2 parents d215bea + 99ec10b commit 365f969

File tree

133 files changed

+7511
-320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+7511
-320
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: 75 additions & 140 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
Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
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

1111
vars:
1212
- &dist_linux
1313
variant: Linux
14-
python: '3.9'
14+
python: "3.9"
1515
os: Linux
16-
platform: ubuntu-22.04
16+
platform: ubuntu-24.04
1717

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

2424
- &dist_win
2525
variant: Windows
26-
python: '3.9'
26+
python: "3.9"
2727
os: Windows
2828
platform: windows-2022
2929

@@ -32,67 +32,63 @@ vars:
3232
platform: ubuntu-latest
3333

3434
jobs:
35-
3635
# Platform tests.
3736
- &test
3837
<<: *dist_linux
3938
type: test
40-
reqs: ['dist', 'test']
41-
skiplists: ['job_test', 'os_linux']
39+
reqs: ["dist", "test"]
40+
skiplists: ["job_test", "os_linux"]
4241
test_args: -p no:pytest-qt --ignore=test/gui_qt
4342
- <<: *test
4443
<<: *dist_macos
45-
cache_extra_deps: ['osx/deps.sh']
46-
skiplists: ['job_test', 'os_macos']
44+
cache_extra_deps: ["osx/deps.sh"]
45+
skiplists: ["job_test", "os_macos"]
4746
- <<: *test
4847
<<: *dist_win
49-
skiplists: ['job_test', 'os_windows']
48+
skiplists: ["job_test", "os_windows"]
5049

5150
# Python tests.
5251
- &python_test
5352
<<: *test
5453
<<: *dist_other
55-
variant: Python 3.7
56-
python: '3.7'
57-
skiplists: ['job_test', 'os_linux', 'os_macos', 'os_windows']
58-
- <<: *python_test
5954
variant: Python 3.8
60-
python: '3.8'
55+
python: "3.8"
56+
skiplists: ["job_test", "os_linux", "os_macos", "os_windows"]
6157
- <<: *python_test
6258
variant: Python 3.10
63-
python: '3.10'
59+
python: "3.10"
6460

6561
# Qt GUI tests.
6662
- <<: *test
6763
type: test_gui_qt
6864
variant: Qt GUI
69-
reqs: ['dist', 'dist_extra_gui_qt', 'test']
70-
skiplists: ['job_test_gui_qt']
65+
reqs: ["dist", "dist_extra_gui_qt", "test"]
66+
skiplists: ["job_test_gui_qt"]
7167
test_args: test/gui_qt
7268

7369
# Packaging tests.
7470
- <<: *dist_other
7571
type: test_packaging
7672
variant: Packaging
77-
python: '3.9'
78-
reqs: ['packaging', 'setup']
79-
skiplists: ['job_test_packaging']
73+
python: "3.9"
74+
reqs: ["packaging", "setup"]
75+
skiplists: ["job_test_packaging"]
8076

8177
# Platform builds.
8278
- &build
8379
<<: *dist_linux
8480
type: build
8581
needs: [test_linux]
86-
reqs: ['build', 'setup']
87-
cache_extra_deps: ['reqs/dist_*.txt', 'linux/appimage/deps.sh']
88-
skiplists: ['job_build', 'os_linux']
82+
reqs: ["build", "setup"]
83+
cache_extra_deps: ["reqs/dist_*.txt", "linux/appimage/deps.sh"]
84+
skiplists: ["job_build", "os_linux"]
8985
- <<: *build
9086
<<: *dist_macos
9187
needs: [test_macos]
92-
cache_extra_deps: ['reqs/dist_*.txt', 'osx/deps.sh']
93-
skiplists: ['job_build', 'os_macos']
88+
cache_extra_deps: ["reqs/dist_*.txt", "osx/deps.sh"]
89+
skiplists: ["job_build", "os_macos"]
9490
- <<: *build
9591
<<: *dist_win
9692
needs: [test_windows]
97-
cache_extra_deps: ['reqs/dist_*.txt', 'windows/dist_deps.sh']
98-
skiplists: ['job_build', 'os_windows']
93+
cache_extra_deps: ["reqs/dist_*.txt", "windows/dist_deps.sh"]
94+
skiplists: ["job_build", "os_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: 7 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

@@ -26,4 +30,7 @@ __pycache__/
2630
# VSCode
2731
/.vscode/
2832

33+
# macOS
34+
.DS_Store
35+
2936
# vim: ft=cfg

.readthedocs.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
4+
version: 2
5+
6+
build:
7+
os: ubuntu-22.04
8+
tools:
9+
python: "3.8"
10+
11+
python:
12+
install:
13+
- requirements: doc/requirements.txt
14+
15+
sphinx:
16+
configuration: doc/conf.py

MANIFEST.in

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
# Include: pretty much everything normally versioned,
2-
# and not already automatically included by setuptools.
31
include CONTRIBUTING.md
42
include LICENSE.txt
53
include NEWS.md
6-
include doc/*
4+
recursive-include doc *.css
5+
recursive-include doc *.html
6+
recursive-include doc *.ico
7+
recursive-include doc *.md
8+
recursive-include doc *.png
9+
recursive-include doc *.svg
10+
recursive-include doc *.py
11+
recursive-include doc *.txt
12+
include launch.bat
13+
include launch.sh
714
include linux/*
815
include linux/appimage/*
916
include news.d/api/*
@@ -28,5 +35,4 @@ include test/*.py
2835
include test/gui_qt/*.py
2936
include tox.ini
3037
include windows/*
31-
3238
exclude plover/gui_qt/*_ui.py

NEWS.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,77 @@
1+
# v4.0.0rc2 (2023-09-28)
2+
3+
4+
5+
## Features
6+
7+
### Core
8+
9+
- Added a configurable delay between key presses, to accommodate applications that can't handle fast keyboard emulation. (#1633)
10+
11+
## Bugfixes
12+
13+
### Core
14+
15+
- Closes serial ports upon disconnection to ensure clean reconnections. (#1636)
16+
17+
### User Interface
18+
19+
- Update the tray icon to "disconnected" when a serial-over-USB machine is unplugged. (#1560)
20+
21+
## API
22+
23+
### Breaking Changes
24+
25+
- Dropped support for Python 3.7. (#1634)
26+
27+
### New
28+
29+
- Introduces the `GenericKeyboardEmulation` interface which automatically handles output delay. (#1633)
30+
31+
32+
# v4.0.0rc1 (2023-09-26)
33+
34+
35+
36+
## Features
37+
38+
### Core
39+
40+
- updated config to use tox4 (#1592)
41+
- Implement first-up chord send for keyboard machine. (#1611)
42+
43+
### User Interface
44+
45+
- Added Traditional Chinese (zh-TW) translation. (#1404)
46+
47+
### Linux
48+
49+
- Update GitHub Actions from Ubuntu 18.04 to 22.04. (#1597)
50+
51+
### macOS
52+
53+
- Update GitHub Actions from macOS 10.15 to 12. (#1598)
54+
- Changes the Plover icon on macOS to match Big Sur-style icons. (#1632)
55+
56+
### Windows
57+
58+
- Update GitHub Actions from Windows 2019 to 2022. (#1598)
59+
60+
## Bugfixes
61+
62+
### User Interface
63+
64+
- Fix "add translation" dialog ignoring the stylesheet's background color for the translation and stroke text. (#1571)
65+
66+
### Windows
67+
68+
- Fixed an issue which caused tests to fail on windows due to case sensitive filepaths. (#1599)
69+
70+
## API
71+
72+
No significant changes.
73+
74+
175
# v4.0.0.dev12 (2022-08-09)
276

377
## Features

0 commit comments

Comments
 (0)