Skip to content

Commit d1c8362

Browse files
committed
Propagate working uv install for windows-installer to publish workflow; re-enable jobs that were disabled for testing
1 parent 2f42f9c commit d1c8362

File tree

3 files changed

+153
-53
lines changed

3 files changed

+153
-53
lines changed

.github/workflows/publish.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,22 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646

47-
- uses: actions/setup-python@v5
47+
- name: Install uv
48+
uses: astral-sh/setup-uv@v6
4849
with:
4950
python-version: "3.11"
51+
enable-cache: true
5052

5153
- name: Install package and dependencies
52-
run: |
53-
# Using pip to ensure proper environment discovery by PyInstaller
54-
python -m pip install --upgrade pip
55-
pip install --only-binary :all: .[ionmob] pyinstaller
54+
run: uv sync --group installer
5655

5756
- name: Install Inno Setup
5857
uses: crazy-max/ghaction-chocolatey@v3
5958
with:
60-
args: install innosetup -y --allow-unofficial --force
59+
args: install innosetup -y --allow-unofficial
6160

6261
- name: Run pyinstaller
63-
run: pyinstaller ./ms2rescore.spec --clean --noconfirm
62+
run: uv run pyinstaller ./ms2rescore.spec --clean --noconfirm
6463

6564
- name: Test built exe
6665
run: dist/ms2rescore/ms2rescore.exe

.github/workflows/test.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ jobs:
1919
- name: Run Ruff
2020
run: uvx ruff check --output-format=github .
2121

22-
# test-python-package:
23-
# needs: check-python-package
24-
# runs-on: ubuntu-latest
25-
# strategy:
26-
# fail-fast: false
27-
# matrix:
28-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
29-
# steps:
30-
# - uses: actions/checkout@v4
31-
32-
# - name: Install uv and set the Python version
33-
# uses: astral-sh/setup-uv@v6
34-
# with:
35-
# python-version: ${{ matrix.python-version }}
36-
# enable-cache: true
37-
38-
# - name: Install the project
39-
# run: uv sync --all-extras --dev
40-
41-
# - name: Run tests
42-
# run: uv run pytest
43-
44-
# - name: Test installation
45-
# run: uv run ms2rescore --help
22+
test-python-package:
23+
needs: check-python-package
24+
runs-on: ubuntu-latest
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
29+
steps:
30+
- uses: actions/checkout@v4
31+
32+
- name: Install uv and set the Python version
33+
uses: astral-sh/setup-uv@v6
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
enable-cache: true
37+
38+
- name: Install the project
39+
run: uv sync --all-extras --dev
40+
41+
- name: Run tests
42+
run: uv run pytest
43+
44+
- name: Test installation
45+
run: uv run ms2rescore --help
4646

4747
test-windows-installer:
4848
runs-on: windows-latest

0 commit comments

Comments
 (0)