Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,15 @@ jobs:
run: curl -L -o installer.exe http://files.jrsoftware.org/is/6/innosetup-6.5.4.exe

- name: Install Inno Setup
run: ./installer.exe /verysilent /allusers /dir=inst
run: |
Start-Process -FilePath ./installer.exe -ArgumentList '/VERYSILENT','/ALLUSERS','/DIR=inst' -Wait -NoNewWindow

- name: Validate Inno Setup installation
run: |
if (-not (Test-Path "$env:GITHUB_WORKSPACE\inst\ISCC.exe")) {
Get-ChildItem inst -Recurse -ErrorAction SilentlyContinue | Format-List FullName, Length
throw 'Inno Setup compiler not found at inst\\ISCC.exe. Ensure the installer step completed successfully.'
}

- name: List installed software versions
run: |
Expand Down
10 changes: 7 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=61.0", "wheel"]
requires = ["setuptools>=66.1.1", "wheel>=0.38.4"]
build-backend = "setuptools.build_meta"

[project]
Expand Down Expand Up @@ -123,10 +123,14 @@ download = "https://github.com/ArduPilot/MethodicConfigurator/releases"
changelog = "https://github.com/ArduPilot/MethodicConfigurator/releases"

[tool.setuptools]
packages = ["ardupilot_methodic_configurator"]
# Rely on discovery for just the top-level package and specify data via package-data
include-package-data = false

[tool.setuptools.packages.find]
include = ["ardupilot_methodic_configurator"]

[tool.setuptools.package-data]
ardupilot_methodic_configurator = ["*.param", "*.png", "*.jpg", "*.json", "*.xml", "*.mo", "*.png"]
ardupilot_methodic_configurator = ["**/*.param", "**/*.png", "**/*.jpg", "**/*.json", "**/*.xml", "**/*.mo", "**/*.png"]

[tool.setuptools.dynamic]
version = {attr = "ardupilot_methodic_configurator.__version__"}
Expand Down
38 changes: 0 additions & 38 deletions setup.py

This file was deleted.

8 changes: 5 additions & 3 deletions test_pip_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

sudo pip uninstall -y MethodicConfigurator
pip uninstall -y MethodicConfigurator
uv pip uninstall -y MethodicConfigurator
sudo rm -Rf /usr/local/MethodicConfigurator/

sudo pip uninstall -y ardupilot_methodic_configurator
pip uninstall -y ardupilot_methodic_configurator
uv pip uninstall -y ardupilot_methodic_configurator
sudo rm -Rf /usr/local/ardupilot_methodic_configurator/

sudo rm -Rf /usr/local/vehicle_templates/
sudo rm -Rf /usr/local/locale/
#sudo rm -Rf /usr/local/locale/
rm -Rf ~/.local/locale
rm -Rf ~/.local/vehicle_templates

Expand All @@ -28,11 +30,11 @@ if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then
else
source .venv/bin/activate
fi
uv pip install -U build packaging setuptools wheel
uv pip install -U "build==1.3.0" "packaging==25.0" "setuptools==66.1.1" "wheel==0.38.4"

python -m build

uv pip install -U dist/ardupilot_methodic_configurator-2.0.3-py3-none-any.whl
uv pip install -U dist/ardupilot_methodic_configurator-2.4.0-py3-none-any.whl

cd ..

Expand Down