From cd9e5e8f8943e37179257bd677b9a6e63d3fc7f5 Mon Sep 17 00:00:00 2001
From: "Dr.-Ing. Amilcar do Carmo Lucas" <amilcar.lucas@iav.de>
Date: Tue, 14 Jan 2025 11:53:26 +0100
Subject: [PATCH] IMPROVEMENT: simplify and speedup pypi publishing

---
 .github/workflows/python-publish.yml | 7 +++----
 pyproject.toml                       | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index e42fe086..834b5eca 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -33,11 +33,10 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install -U pip wheel pymavlink build
-        pip install -U .
+        python -m pip install -U build packaging pip setuptools wheel
 
     - name: Build package
-      run: python -m build --wheel
+      run: python -m build .
 
-    - name: Publish package distribuitions to PyPI
+    - name: Publish package distributions to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/pyproject.toml b/pyproject.toml
index abaaf248..b1657456 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -85,9 +85,9 @@ changelog = "https://github.com/ArduPilot/MethodicConfigurator/releases"
 
 [tool.setuptools]
 packages = ["ardupilot_methodic_configurator"]
-package-data = {ardupilot_methodic_configurator = ["*.param", "*.jpg", "*.json", "*.xml", "*.mo", "*.png"]}
-exclude-package-data = {ardupilot_methodic_configurator = ["test.xml"]}
-include-package-data = true
+
+[tool.setuptools.package-data]
+ardupilot_methodic_configurator = ["*.param", "*.jpg", "*.json", "*.xml", "*.mo", "*.png"]
 
 [tool.setuptools.dynamic]
 version = {attr = "ardupilot_methodic_configurator.__version__"}