Skip to content

Commit 526b0f4

Browse files
authored
Merge pull request #50 from DavidCEllis/fix-actions-upgrade
* Update base python for exe build to 3.13 * Update github actions
2 parents 65744e9 + 4996a1a commit 526b0f4

8 files changed

Lines changed: 853 additions & 796 deletions

File tree

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ updates:
88
groups:
99
ci-actions:
1010
patterns: ["*"]
11+
cooldown:
12+
default-days: 7

.github/workflows/auto-test.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
pull_request:
77
branches: [ "main" ]
88

9+
permissions: {}
10+
911
jobs:
1012
test-splitguides:
1113

@@ -14,12 +16,14 @@ jobs:
1416
fail-fast: false
1517
matrix:
1618
os: [windows-latest]
17-
python-version: ["3.12", "3.13"]
19+
python-version: ["3.12", "3.13", "3.14"]
1820

1921
steps:
20-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
23+
with:
24+
persist-credentials: false
2125
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v6
26+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2327
with:
2428
python-version: ${{ matrix.python-version }}
2529
- name: Install dependencies

.github/workflows/build-exe.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ on:
44
release:
55
types: [published]
66

7+
permissions: {}
8+
79
jobs:
810
build:
911
name: Build executable
1012
runs-on: windows-latest
1113

1214
steps:
13-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1416
with:
1517
fetch-depth: 0
18+
persist-credentials: false
1619
- name: Set up Python
17-
uses: actions/setup-python@v6
20+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
1821
with:
19-
python-version: "3.12"
22+
python-version: "3.13"
2023
- name: Install the module
2124
run: |
2225
python -m pip install --upgrade pip
@@ -25,7 +28,7 @@ jobs:
2528
run: |
2629
python application/setup.py build
2730
- name: Store the built application
28-
uses: actions/upload-artifact@v6
31+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
2932
with:
3033
name: splitguides-app
3134
path: build/SplitGuides_v*.zip
@@ -42,23 +45,24 @@ jobs:
4245
id-token: write # IMPORTANT: mandatory for sigstore
4346
steps:
4447
- name: Download the zipapp
45-
uses: actions/download-artifact@v7
48+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
4649
with:
4750
name: splitguides-app
4851
path: dist/
4952
- name: Sign the zipapp with Sigstore
50-
uses: sigstore/gh-action-sigstore-python@v3.2.0
53+
uses: sigstore/gh-action-sigstore-python@a5caf349bc536fbef3668a10ed7f5cd309a4b53d # v3.2.0
5154
with:
5255
release-signing-artifacts: false
5356
inputs: >-
5457
./dist/*.zip
5558
- name: Upload artifact signature to GitHub Release
5659
env:
5760
GITHUB_TOKEN: ${{ github.token }}
61+
shell: bash
5862
# Upload to GitHub Release using the `gh` CLI.
5963
# `dist/` contains the built packages, and the
6064
# sigstore-produced signatures and certificates.
6165
run: >-
6266
gh release upload
63-
'${{ github.ref_name }}' dist/**
64-
--repo '${{ github.repository }}'
67+
"${GITHUB_REF_NAME}" dist/**
68+
--repo "${GITHUB_REPOSITORY}"

.github/workflows/publish_to_pypi.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ on:
44
release:
55
types: [published]
66

7+
permissions: {}
8+
79
jobs:
810
build:
911
name: Build Wheel
1012
runs-on: windows-latest
1113

1214
steps:
13-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1416
with:
1517
fetch-depth: 0
18+
persist-credentials: false
1619
- name: Set up Python
17-
uses: actions/setup-python@v6
20+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
1821
with:
19-
python-version: "3.12"
22+
python-version: "3.13"
2023
- name: Install pypa/build
2124
run: >-
2225
python3 -m
@@ -26,7 +29,7 @@ jobs:
2629
- name: Build a binary wheel and a source tarball
2730
run: python3 -m build
2831
- name: Store the distribution packages
29-
uses: actions/upload-artifact@v6
32+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3033
with:
3134
name: python-package-distributions
3235
path: dist/
@@ -45,12 +48,12 @@ jobs:
4548

4649
steps:
4750
- name: Download all the dists
48-
uses: actions/download-artifact@v7
51+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
4952
with:
5053
name: python-package-distributions
5154
path: dist/
5255
- name: Publish distribution 📦 to PyPI
53-
uses: pypa/gh-action-pypi-publish@release/v1
56+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
5457

5558
github-release:
5659
name: >-
@@ -66,12 +69,12 @@ jobs:
6669

6770
steps:
6871
- name: Download all the dists
69-
uses: actions/download-artifact@v7
72+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
7073
with:
7174
name: python-package-distributions
7275
path: dist/
7376
- name: Sign the dists with Sigstore
74-
uses: sigstore/gh-action-sigstore-python@v3.2.0
77+
uses: sigstore/gh-action-sigstore-python@a5caf349bc536fbef3668a10ed7f5cd309a4b53d # v3.2.0
7578
with:
7679
release-signing-artifacts: false
7780
inputs: >-
@@ -80,10 +83,11 @@ jobs:
8083
- name: Upload artifact signatures to GitHub Release
8184
env:
8285
GITHUB_TOKEN: ${{ github.token }}
86+
shell: bash
8387
# Upload to GitHub Release using the `gh` CLI.
8488
# `dist/` contains the built packages, and the
8589
# sigstore-produced signatures and certificates.
8690
run: >-
8791
gh release upload
88-
'${{ github.ref_name }}' dist/**
89-
--repo '${{ github.repository }}'
92+
"${GITHUB_REF_NAME}" dist/**
93+
--repo "${GITHUB_REPOSITORY}"

.github/workflows/test-builds.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ on:
66
pull_request:
77
branches: [ "main" ]
88

9+
permissions: {}
910

1011
jobs:
1112
exe-build:
1213
name: Test exe Build
1314
runs-on: windows-latest
1415

1516
steps:
16-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1718
with:
1819
fetch-depth: 0
20+
persist-credentials: false
1921
- name: Set up Python
20-
uses: actions/setup-python@v6
22+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2123
with:
22-
python-version: "3.12" # build with oldest supported python
24+
python-version: "3.13" # build with oldest supported python
2325
- name: Install the module
2426
run: |
2527
python -m pip install --upgrade pip
@@ -28,7 +30,7 @@ jobs:
2830
run: >-
2931
python application/setup.py build
3032
- name: Store the built app
31-
uses: actions/upload-artifact@v6
33+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3234
with:
3335
name: splitguides-app-dev
3436
path: build/SplitGuides_v*.zip
@@ -39,13 +41,14 @@ jobs:
3941
runs-on: windows-latest
4042

4143
steps:
42-
- uses: actions/checkout@v6
44+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4345
with:
4446
fetch-depth: 0
47+
persist-credentials: false
4548
- name: Set up Python
46-
uses: actions/setup-python@v6
49+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4750
with:
48-
python-version: "3.12"
51+
python-version: "3.13"
4952
- name: Install pypa/build
5053
run: >-
5154
python3 -m
@@ -55,8 +58,8 @@ jobs:
5558
- name: Build a binary wheel and a source tarball
5659
run: python3 -m build
5760
- name: Store the distribution packages
58-
uses: actions/upload-artifact@v6
61+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5962
with:
6063
name: python-package-distributions
6164
path: dist/
62-
retention-days: 1
65+
retention-days: 1

application/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
base = None
3131
if sys.platform == "win32":
32-
base = "Win32GUI"
32+
base = "gui"
3333

3434
options = {
3535
"build_exe": {

pyproject.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ authors = [
1515
readme = "README.md"
1616
requires-python = ">=3.12"
1717
dependencies = [
18-
"pyside6~=6.9.0",
18+
"pyside6~=6.11.0",
1919
"jinja2~=3.1",
2020
"bleach[css]==6.0", # Each upgrade to bleach has broken something so pin it.
2121
"flask~=3.0",
@@ -31,6 +31,7 @@ classifiers = [
3131
"Operating System :: POSIX :: Linux",
3232
"Programming Language :: Python :: 3.12",
3333
"Programming Language :: Python :: 3.13",
34+
"Programming Language :: Python :: 3.14",
3435
"Topic :: Games/Entertainment",
3536
]
3637
dynamic = ['version']
@@ -64,3 +65,11 @@ addopts = "--cov=src/ --cov-report=term-missing"
6465
testpaths = [
6566
"tests",
6667
]
68+
69+
[tool.uv]
70+
exclude-newer = "1 week"
71+
72+
[tool.uv.exclude-newer-package]
73+
# Exclude other projects I own as they may contain early fixes
74+
ducktools-classbuilder = false
75+
reannotate = false

0 commit comments

Comments
 (0)