Skip to content

Commit

Permalink
Feature/build (#756)
Browse files Browse the repository at this point in the history
use uv in github workflow builds and update to python3.13 / Qt6.8
  • Loading branch information
zarath authored Jan 16, 2025
1 parent 588c854 commit e3587e2
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 38 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/release_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,21 @@ jobs:
run: |
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt-get update
sudo apt install -y python3.11 python3-pip python3.11-venv \
python3.11-dev \
sudo apt install -y python3.13 python3-pip python3.13-venv \
python3.13-dev \
'^libxcb.*-dev' libx11-xcb-dev \
libglu1-mesa-dev libxrender-dev libxi-dev \
libxkbcommon-dev libxkbcommon-x11-dev
- name: Install dependencies and pyinstall
run: |
python3.11 -m venv build
python3.13 -m venv build
. build/bin/activate
python -m pip install pip==24.3.1 setuptools==75.6.0
pip install -r requirements.txt
pip install PyInstaller==6.11.1
python3 -m pip install -U PyQt6-sip
python3 -m pip install -U PyQt6
python -m pip install uv
uv sync
- name: Build binary
run: |
. build/bin/activate
python setup.py -V
pyinstaller --onefile \
-p src \
-n nanovna-saver \
nanovna-saver.py
uv run task build-pkg-linux
- name: Archive production artifacts
uses: actions/upload-artifact@v4
with:
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/release_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ jobs:
run: |
python3 -m venv venv
.\venv\Scripts\activate
python3 -m pip install pip==24.3.1
python3 -m pip install -U setuptools setuptools-scm
python3 -m pip install -r requirements.txt
python3 -m pip install PyInstaller==6.11.1
python3 -m pip install -U PyQt6-sip
python3 -m pip install -U PyQt6
python3 -m pip install uv
uv sync
- name: Build binary
run: |
.\venv\Scripts\activate
python3 setup.py -V
pyinstaller --onefile --noconsole -i icon_48x48.ico -p src -n nanovna-saver.exe nanovna-saver.py
uv run task build-pkg-win
- name: Archive production artifacts
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dynamic=['version']

dependencies=[
'pyserial~=3.5',
'PyQt6~=6.7',
'PyQt6~=6.8',
'PyQt6-sip~=13.8',
'numpy~=2.1',
'scipy~=1.14',
Expand Down
34 changes: 18 additions & 16 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e3587e2

Please sign in to comment.