From 84692f8227000b3e6b5109a1e19ea9a88bed4860 Mon Sep 17 00:00:00 2001
From: "Dr.-Ing. Amilcar do Carmo Lucas" <amilcar.lucas@iav.de>
Date: Mon, 13 May 2024 17:46:12 +0200
Subject: [PATCH] IMPROVEMENT: setup.py include vehicle templates into PyPI
 generated package

Remove unused, outdated code
Declare some auxiliary scripts as such
---
 MANIFEST.in |  1 +
 setup.py    | 36 +++++++-----------------------------
 2 files changed, 8 insertions(+), 29 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..765e29c
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include vehicle_templates *
diff --git a/setup.py b/setup.py
index b28b5f6..f544b2a 100644
--- a/setup.py
+++ b/setup.py
@@ -18,26 +18,6 @@
 from MethodicConfigurator.version import VERSION
 
 
-def package_files(directory):
-    paths = []
-    for (path, _directories, filenames) in os.walk(directory):
-        for filename in filenames:
-            paths.append(os.path.join('..', path, filename))
-    return paths
-
-
-package_data = [
-    'vehcle_templates/ArduCopter/diatone_taycan_mxc/*',
-    # Add any other package_data requirements here
-]
-
-# note that we do not include all the real dependencies here (like lxml etc)
-# as that breaks the pip install. It seems that pip is not smart enough to
-# use the system versions of these dependencies, so it tries to download and install
-# large numbers of modules like tkinter etc which may be already installed
-requirements = ['pymavlink>=2.4.14',
-                'pyserial>=3.0']
-
 dev_requirements = [
     'ruff',
     'pytest',
@@ -96,21 +76,19 @@ def package_files(directory):
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Scientific/Engineering',
     ],
     # Add the license
     license='GPLv3',
     python_requires='>=3.6',
     keywords=['ArduPilot', 'Configuration', 'SCM', 'Methodic', 'ArduCopter', 'ArduPlane', 'ArduRover', 'ArduSub'],
-    # Include package data
-    # package_data={
-    #    # If you have data files
-    #    '': ['*.md', '*.txt', '*.xml', '*.json'],
-    #    '4.3.8-params': ['*.param'],
-    #    '4.4.4-params': ['*.param'],
-    #    '4.5.1-params': ['*.param'],
-    #    '4.6.0-DEV-params': ['*.param'],
-    # },
+    include_package_data=True,
+    scripts=['MethodicConfigurator/annotate_params.py',
+             'MethodicConfigurator/extract_param_defaults.py',
+             'MethodicConfigurator/param_pid_adjustment_update.py'
+             ],
     # Specify entry points for command-line scripts
     entry_points={
         'console_scripts': [