Update to python 3.11

.github/workflows/run-tests.yml

@@ -1,4 +1,4 @@
-# This workflow will install Python dependencies and run tests with PyTest using Python 3.8
+# This workflow will install Python dependencies and run tests with PyTest using Python 3.11
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
 name: Run tests
@@ -19,10 +19,10 @@ jobs:
         uses: actions/checkout@v3
 
       # Set Python version
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       # Set up submodules
       - name: Set up all submodules and project dependencies
@@ -34,6 +34,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
+          git submodule foreach --recursive "pip install -r requirements.txt"
 
       # Install zbar library to resolve pyzbar import error
       - name: Install zbar library

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "mavlink/dronekit"]
+	path = mavlink/dronekit
+	url = https://github.com/UWARG/dronekit.git
+	branch = WARG-minimal

mavlink/modules/flight_controller.py

@@ -4,7 +4,7 @@
 
 import time
 
-import dronekit
+from .. import dronekit
 
 from . import drone_odometry
 

mavlink/test_mission_ended.py

@@ -4,7 +4,7 @@
 
 import time
 
-import dronekit
+from mavlink import dronekit
 
 from mavlink.modules import flight_controller
 

pyproject.toml

@@ -15,6 +15,9 @@ ignore-paths = [
 
     # Logging
     "logs/",
+
+    # Submodule dronekit
+    "mavlink/dronekit",
 ]
 
 # Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
@@ -24,7 +27,7 @@ jobs = 0
 
 # Minimum Python version to use for version dependent checks. Will default to the
 # version used to run pylint.
-py-version = "3.8"
+py-version = "3.11"
 
 # Discover python modules and packages in the file system subtree.
 recursive = true
@@ -99,4 +102,7 @@ minversion = "6.0"
 
 [tool.black]
 line-length = 100
-target-version = ["py38"]
+target-version = ["py311"]
+# Excludes files or directories in addition to the defaults
+# Submodules
+extend-exclude = "mavlink/dronekit/*"

requirements.txt

@@ -11,9 +11,6 @@ numpy
 # Module lte
 Pillow
 
-# Module mavlink
-dronekit
-
 # Module qr
 pyzbar
 

setup.cfg

@@ -17,3 +17,6 @@ extend-exclude=
 
     # Logging
     logs/,
+
+    # Submodule dronekit
+    mavlink/dronekit,

setup_project.ps1

@@ -0,0 +1,21 @@
+# Initialize the project for Windows
+
+# Activate venv to prevent accidentally installing into global space
+./venv/Scripts/Activate.ps1
+
+if($?) {
+    # If successfully activated venv
+    "Installing project dependencies..."
+    pip install -r requirements.txt
+
+    ""
+    "Installing submodules and their dependencies..."
+    git submodule update --init --remote --recursive
+    git submodule foreach --recursive "pip install -r requirements.txt"
+
+    deactivate
+    ""
+    "Seutp complete!"
+} else {
+    "Please install a virtual environment in the directory 'venv', at the project root directory"
+}

setup_project.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Initialize and update submodules script for Linux
+
+# Activate venv to prevent accidentally installing into global space
+source ./venv/bin/activate
+
+if [ $? -eq 0 ]; then
+    echo "Installing project dependencies..."
+    pip install -r requirements.txt
+
+    echo ""
+    echo "Installing submodules and their dependencies..."
+    git submodule update --init --remote --recursive
+    git submodule foreach --recursive "pip install -r requirements.txt"
+
+    deactivate
+    echo ""
+    echo "Setup complete!"
+else
+    echo "Please install a virtual environment in the directory 'venv', at the project root directory"
+fi