Merge branch 'master' into ebuild-package-conditions

.github/workflows/ci.yaml

@@ -1,6 +1,7 @@
 name: superflore-ci
 
 on:
+  workflow_dispatch:
   push:
     branches: ['master']
   pull_request:
@@ -9,21 +10,33 @@ jobs:
     build:
       strategy:
         matrix:
-          os: [ubuntu-18.04, ubuntu-20.04]
-          python: [3.6, 3.7, 3.8, 3.9]
+          os: ["ubuntu-20.04", "ubuntu-22.04"]
+          python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
       name: superflore tests
       runs-on: ${{matrix.os}}
       steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{matrix.python}}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{matrix.python}}
       - name: Install dependencies
         run: |
-          echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" | sudo tee -a /etc/apt/sources.list.d/ros-latest.list
-          wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc -O /tmp/ros.asc
-          sudo apt-key add /tmp/ros.asc
+          echo "Set locale"
+          sudo apt update && sudo apt install locales
+          sudo locale-gen en_US en_US.UTF-8
+          sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+          export LANG=en_US.UTF-8
+
+          echo "Enable required repositories"
+          sudo apt install software-properties-common
+          sudo add-apt-repository universe
+
+          sudo apt update && sudo apt install curl -y
+          sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+
+          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
+
           sudo apt-get update -qq
           sudo apt-get install dpkg -y
           sudo apt-get install -y python3-rosdep
@@ -32,7 +45,7 @@ jobs:
         run: |
           sudo rosdep init
           rosdep update
-          python -m 'nose' --exclude test_pull --exclude test_run --exclude test_logger_output
+          python -m 'nose' --verbose --exclude test_pull --exclude test_run --exclude test_logger_output --exclude test_failed_to_create  --exclude test_generate_installers --ignore-files test_ebuild.py  --ignore-files test_docker.py
           python -m 'flake8' superflore --import-order-style=google
 
 

requirements.txt

@@ -1,4 +1,4 @@
-nose
+pynose
 flake8
 flake8-import-order
 termcolor

superflore/generators/ebuild/ebuild.py

@@ -138,12 +138,13 @@ def get_ebuild_text(self, distributor, license_text):
         # EAPI=<eapi>
         ret = self.get_license_line(distributor, license_text)
         ret += self.get_eapi_line()
+
         if self.python_3 and not self.is_ros2:
             # enable python 2.7 and python 3.5
             ret += self.get_python_compat(['2_7', '3_5', '3_6'])
-        elif self.python_3:
-            # only use 3.5, 3.6 for ROS 2
-            ret += self.get_python_compat(['3_8','3_9' ,'3_10','3_11'])
+        elif self.python_3 or (self.distro == 'noetic'):
+            # only use 3.5 - 3.9 for ROS 2 or noetic
+            ret += self.get_python_compat(['3_5', '3_6', '3_7', '3_8', '3_9', '3_10','3_11'])
         else:
             # fallback to python 2.7
             ret += self.get_python_compat(['2_7'])

superflore/generators/ebuild/overlay_instance.py

@@ -60,9 +60,9 @@ def commit_changes(self, distro):
             self.repo.git.commit(m='{0}'.format(commit_msg))
 
     def regenerate_manifests(
-        self, 
-        regen_dict, 
-        image_owner='tomkimsour', 
+        self,
+        regen_dict,
+        image_owner='allenh1',
         image_name='ros_gentoo_base',
         split_limit=1000
     ):