FIX Rename ardupilot_methodic_configurator.py to __main__.py

Author: amilcarlucas

.vscode/launch.json

@@ -24,10 +24,10 @@
             "args": "--loglevel DEBUG --debug 2 rmdir lkvn"
         },
         {
-            "name": "Python Debugger: ardupilot_methodic_configurator.py",
+            "name": "Python Debugger: __main__.py",
             "type": "debugpy",
             "request": "launch",
-            "program": "ardupilot_methodic_configurator/ardupilot_methodic_configurator.py",
+            "program": "ardupilot_methodic_configurator/__main__.py",
             "args": [
                 "--allow-editing-template-files",
                 "--device=none",

ardupilot_methodic_configurator/ardupilot_methodic_configurator.py renamed to ardupilot_methodic_configurator/__main__.py

@@ -27,7 +27,7 @@ prog_dir=$(realpath "$(dirname "$0")")/ardupilot_methodic_configurator
 if [ -f /etc/debian_version ] || [ -f /etc/os-release ] && grep -q 'ID_LIKE=.*debian.*' /etc/os-release; then
     echo "Creating ardupilot_methodic_configurator.desktop for Debian-based systems..."
     # Define the desktop entry content
-    desktop_entry="[Desktop Entry]\nName=ArduPilot Methodic Configurator\nComment=A clear ArduPilot configuration sequence\nExec=bash -c 'cd $prog_dir && python3 ardupilot_methodic_configurator.py'\nIcon=$prog_dir/ArduPilot_icon.png\nTerminal=true\nType=Application\nCategories=Development;\nKeywords=ardupilot;arducopter;drone;copter;scm"
+    desktop_entry="[Desktop Entry]\nName=ArduPilot Methodic Configurator\nComment=A clear ArduPilot configuration sequence\nExec=bash -c 'cd $prog_dir && python3 -m ardupilot_methodic_configurator'\nIcon=$prog_dir/ArduPilot_icon.png\nTerminal=true\nType=Application\nCategories=Development;\nKeywords=ardupilot;arducopter;drone;copter;scm"
     # Create the .desktop file in the appropriate directory
     echo -e "$desktop_entry" > "/home/$USER/.local/share/applications/ardupilot_methodic_configurator.desktop"
     echo "ardupilot_methodic_configurator.desktop created successfully."
@@ -63,7 +63,6 @@ cp ardupilot_methodic_configurator/vehicle_templates ~/.local/lib/python3.12/sit
 echo "Installation complete."
 echo ""
 echo "You can run the ArduPilot methodic configurator GUI by executing:"
-echo "cd ardupilot_methodic_configurator"
-echo "python3 ardupilot_methodic_configurator.py"
+echo "python3 -m ardupilot_methodic_configurator"
 echo ""
 echo "For more detailed usage instructions, please refer to the USERMANUAL.md file."

install_linux.sh

@@ -17,7 +17,6 @@ python3 -m pip install .
 echo "Installation complete."
 echo ""
 echo "You can run the ArduPilot methodic configurator GUI by executing:"
-echo "cd ardupilot_methodic_configurator"
-echo "python3 ./ardupilot_methodic_configurator.py"
+echo "python3 -m ardupilot_methodic_configurator"
 echo ""
 echo "For more detailed usage instructions, please refer to the USERMANUAL.md file."

install_macos.sh

@@ -42,14 +42,12 @@ echo Hard links creation complete
 echo.
 echo To run the ArduPilot methodic configurator GUI, execute the following command:
 echo.
-echo cd ardupilot_methodic_configurator
-echo python3 ardupilot_methodic_configurator.py
+echo python3 -m ardupilot_methodic_configurator
 echo.
 echo If you encounter issues with auto-connecting to the wrong device on MS Windows,
 echo you can explicitly set the device with the --device command line option:
 echo.
-echo cd ardupilot_methodic_configurator
-echo python3 ardupilot_methodic_configurator.py --device COMX
+echo python3 -m ardupilot_methodic_configurator --device COMX
 echo.
 echo Replace COMX with the correct COM port for your device.
 echo.

install_windows.bat

@@ -1,7 +1,7 @@
 del /Q dist\*
 
-rem python3.11.exe -m PyInstaller --onefile --noconfirm --add-data "4.4.4-test-params\00_default.param;4.4.4-test-params" --add-data "apm.pdef.xml;." --add-data "apm.pdef.4.3.8-params.xml;." --add-data "apm.pdef.4.4.4-params.xml;." --add-data "apm.pdef.4.5.x-params.xml;." --add-data "apm.pdef.4.6.x-params.xml;." --add-data "ArduPilot_icon.png;." --add-data "configuration_steps_ArduCopter.json;." ardupilot_methodic_configurator.py
-python3.11.exe -m PyInstaller --onefile --noconfirm ardupilot_methodic_configurator\ardupilot_methodic_configurator.py
+rem python3.11.exe -m PyInstaller --onefile --noconfirm --add-data "4.4.4-test-params\00_default.param;4.4.4-test-params" --add-data "apm.pdef.xml;." --add-data "apm.pdef.4.3.8-params.xml;." --add-data "apm.pdef.4.4.4-params.xml;." --add-data "apm.pdef.4.5.x-params.xml;." --add-data "apm.pdef.4.6.x-params.xml;." --add-data "ArduPilot_icon.png;." --add-data "configuration_steps_ArduCopter.json;." __main__.py
+python3 -m PyInstaller --onefile --noconfirm ardupilot_methodic_configurator\__main__.py
 md dist\4.4.4-test-params
 copy 4.4.4-test-params\00_default.param dist\4.4.4-test-params
 copy apm.pdef.4.3.8-params.xml dist

package.bat

@@ -57,7 +57,7 @@ dev = [
 ]
 
 [project.scripts]
-ardupilot_methodic_configurator = "ardupilot_methodic_configurator.ardupilot_methodic_configurator:main"
+ardupilot_methodic_configurator = "ardupilot_methodic_configurator.__main__:main"
 extract_param_defaults = "ardupilot_methodic_configurator.extract_param_defaults:main"
 annotate_params = "ardupilot_methodic_configurator.annotate_params:main"
 param_pid_adjustment_update = "ardupilot_methodic_configurator.param_pid_adjustment_update:main"

pyproject.toml

@@ -26,7 +26,7 @@
 for file in extra_scripts:
     os.chmod(file, 0o755)  # noqa: S103
 
-os.chmod("ardupilot_methodic_configurator/ardupilot_methodic_configurator.py", 0o755)  # noqa: S103
+os.chmod("ardupilot_methodic_configurator/__main__.py", 0o755)  # noqa: S103
 
 # Read the long description from the README file
 with open("README.md", encoding="utf-8") as f:

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Unittests for the ardupilot_methodic_configurator.py file.
+Unittests for the __main__.py file.
 
 This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
 
@@ -18,7 +18,7 @@
 
 # from unittest.mock import MagicMock
 # from unittest.mock import mock_open
-from ardupilot_methodic_configurator.ardupilot_methodic_configurator import argument_parser
+from ardupilot_methodic_configurator.__main__ import argument_parser
 
 
 class TestArgumentParser(unittest.TestCase):  # pylint: disable=missing-class-docstring

unittests/ardupilot_methodic_configurator_test.py

@@ -5,10 +5,10 @@ from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 import os
 
 
-ardupilot_methodic_configuratorAny = Analysis(['ardupilot_methodic_configurator.py'],
+ardupilot_methodic_configuratorAny = Analysis(['__main__.py'],
              pathex=[os.path.abspath('.')],
              # for some unknown reason these hidden imports don't pull in
-             # all the needed pieces, so we also import them in ardupilot_methodic_configurator.py
+             # all the needed pieces, so we also import them in __main__.py
              hiddenimports=['packaging', 'packaging.version', 'packaging.specifiers'] +
                             collect_submodules('ardupilot_methodic_configurator.modules') +
                             collect_submodules('pymavlink'),