automatic merge triggered by jenkins to include upstream (ros/rosdist…

…ro) updates
LCAS · Aug 5, 2023 · 98b3324 · 98b3324
2 parents c964124 + f39f006
commit 98b3324
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 24 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -303,17 +303,19 @@ If you want to run the tests before submitting, first install the dependencies.
 python3 -m pip install -r test/requirements.txt
 ```
 
-To run the tests run ``nosetests`` in the root of the repository.
-These tests require several dependencies that can be installed either from the ROS repositories or via pip(list built based on the content of [.travis.yaml](https://github.com/ros/rosdistro/blob/master/.travis.yml):
+To run the tests run ``pytest -s test`` in the root of the repository.
+These tests require several dependencies that can be installed either from the ROS repositories or via pip (list built based on the content of [test/requirements.txt](https://github.com/ros/rosdistro/blob/master/test/requirements.txt):
 
-| Dependency   | Ubuntu package (<=20.04)| Pip package  |
+| Dependency   | Ubuntu package (<=22.04)| Pip package  |
 | :------------: | --------------------------------- | -------------- |
-| catkin_pkg     | python-catkin-pkg                 | catkin-pkg     |
-| github         | python-github                     | PyGithub       |
-| nose           | python-nose                       | nose           |
-| rosdistro      | python-rosdistro                  | rosdistro      |
-| ros_buildfarm  | python-ros-buildfarm              | ros-buildfarm  |
-| unidiff        | python-unidiff (Zesty and higher) | unidiff        |
+| catkin_pkg     | python3-catkin-pkg                 | catkin-pkg     |
+| github         | python3-github                     | PyGithub       |
+| pytest         | python3-pytest                    | pytest         |
+| yaml           | python3-yaml                      | PyYAML         |
+| rosdep         | python3-rosdep                    | rosdep         |
+| rosdistro      | python3-rosdistro                  | rosdistro      |
+| ros_buildfarm  | python3-ros-buildfarm              | ros-buildfarm  |
+| unidiff        | python3-unidiff (Zesty and higher) | unidiff        |
 | yamllint       | yamllint                          | yamllint       |
 
 There is a tool [scripts/check_rosdep](./scripts/check_rosdep.py) which will check most formatting errors such as alphabetization and correct formatting.
@@ -323,5 +325,3 @@ For example, to check a change to `rosdep/base.yaml`:
 ```bash
 python3 scripts/check_rosdep.py rosdep/base.yaml
 ```
-
-Note: There's a [known issue](https://github.com/disqus/nose-unittest/issues/2) discovered [here](https://github.com/ros/rosdistro/issues/16336) that most tests won't run if you have the python package `nose-unitttest` installed.
diff --git a/humble/distribution.yaml b/humble/distribution.yaml
@@ -2422,7 +2422,7 @@ repositories:
       tags:
         release: release/humble/{package}/{version}
       url: https://github.com/ros2-gbp/joint_state_publisher-release.git
-      version: 2.3.0-1
+      version: 2.4.0-1
     source:
       test_pull_requests: true
       type: git
@@ -3147,7 +3147,7 @@ repositories:
       tags:
         release: release/humble/{package}/{version}
       url: https://github.com/ros2-gbp/metavision_driver-release.git
-      version: 1.0.1-2
+      version: 1.0.3-1
     source:
       type: git
       url: https://github.com/ros-event-camera/metavision_driver.git
@@ -4694,6 +4694,22 @@ repositories:
       url: https://github.com/rt-net/raspimouse_description.git
       version: humble-devel
     status: maintained
+  raspimouse_ros2_examples:
+    doc:
+      type: git
+      url: https://github.com/rt-net/raspimouse_ros2_examples.git
+      version: humble-devel
+    release:
+      tags:
+        release: release/humble/{package}/{version}
+      url: https://github.com/ros2-gbp/raspimouse_ros2_examples-release.git
+      version: 2.0.0-1
+    source:
+      test_pull_requests: true
+      type: git
+      url: https://github.com/rt-net/raspimouse_ros2_examples.git
+      version: humble-devel
+    status: maintained
   rc_common_msgs:
     doc:
       type: git
@@ -6980,7 +6996,7 @@ repositories:
       tags:
         release: release/humble/{package}/{version}
       url: https://github.com/SteveMacenski/slam_toolbox-release.git
-      version: 2.6.4-1
+      version: 2.6.5-1
     source:
       test_pull_requests: true
       type: git

diff --git a/iron/distribution.yaml b/iron/distribution.yaml
@@ -2070,7 +2070,7 @@ repositories:
       tags:
         release: release/iron/{package}/{version}
       url: https://github.com/ros2-gbp/joint_state_publisher-release.git
-      version: 2.3.0-3
+      version: 2.4.0-1
     source:
       test_pull_requests: true
       type: git
@@ -3059,7 +3059,7 @@ repositories:
       tags:
         release: release/iron/{package}/{version}
       url: https://github.com/SteveMacenski/navigation2-release.git
-      version: 1.2.1-1
+      version: 1.2.2-1
     source:
       type: git
       url: https://github.com/ros-planning/navigation2.git
@@ -4915,7 +4915,7 @@ repositories:
       tags:
         release: release/iron/{package}/{version}
       url: https://github.com/ros2-gbp/ros2_controllers-release.git
-      version: 3.12.0-1
+      version: 3.13.0-1
     source:
       type: git
       url: https://github.com/ros-controls/ros2_controllers.git
@@ -6117,6 +6117,21 @@ repositories:
       url: https://github.com/septentrio-gnss/septentrio_gnss_driver.git
       version: ros2
     status: maintained
+  sick_safetyscanners2:
+    doc:
+      type: git
+      url: https://github.com/SICKAG/sick_safetyscanners2.git
+      version: master
+    release:
+      tags:
+        release: release/iron/{package}/{version}
+      url: https://github.com/SICKAG/sick_safetyscanners2-release.git
+      version: 1.0.3-1
+    source:
+      type: git
+      url: https://github.com/SICKAG/sick_safetyscanners2.git
+      version: master
+    status: developed
   sick_safetyscanners2_interfaces:
     doc:
       type: git
@@ -6187,7 +6202,7 @@ repositories:
       tags:
         release: release/iron/{package}/{version}
       url: https://github.com/SteveMacenski/slam_toolbox-release.git
-      version: 2.7.0-2
+      version: 2.7.1-1
     source:
       test_pull_requests: true
       type: git

diff --git a/noetic/distribution.yaml b/noetic/distribution.yaml
@@ -7430,7 +7430,7 @@ repositories:
       tags:
         release: release/noetic/{package}/{version}
       url: https://github.com/ADVRHumanoids/point_cloud2_filters-release.git
-      version: 1.0.1-1
+      version: 1.0.2-1
     source:
       type: git
       url: https://github.com/ADVRHumanoids/point_cloud2_filters.git
@@ -8106,6 +8106,31 @@ repositories:
       url: https://bitbucket.org/qbrobotics/qbmove-ros.git
       version: production-noetic
     status: developed
+  qb_softhand_industry:
+    doc:
+      type: git
+      url: https://bitbucket.org/qbrobotics/qbshin-ros.git
+      version: production-noetic
+    release:
+      packages:
+      - qb_softhand_industry
+      - qb_softhand_industry_bringup
+      - qb_softhand_industry_control
+      - qb_softhand_industry_description
+      - qb_softhand_industry_driver
+      - qb_softhand_industry_hardware_interface
+      - qb_softhand_industry_msgs
+      - qb_softhand_industry_srvs
+      - qb_softhand_industry_utils
+      tags:
+        release: release/noetic/{package}/{version}
+      url: https://bitbucket.org/qbrobotics/qbshin-ros-release.git
+      version: 1.0.8-3
+    source:
+      type: git
+      url: https://bitbucket.org/qbrobotics/qbshin-ros.git
+      version: production-noetic
+    status: developed
   qpoases_vendor:
     doc:
       type: git

diff --git a/rolling/distribution.yaml b/rolling/distribution.yaml
@@ -2044,7 +2044,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/joint_state_publisher-release.git
-      version: 2.3.0-2
+      version: 2.4.0-1
     source:
       test_pull_requests: true
       type: git
@@ -2575,7 +2575,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/metavision_driver-release.git
-      version: 1.0.2-1
+      version: 1.0.3-1
     source:
       type: git
       url: https://github.com/ros-event-camera/metavision_driver.git
@@ -4808,7 +4808,7 @@ repositories:
       tags:
         release: release/rolling/{package}/{version}
       url: https://github.com/ros2-gbp/ros2_controllers-release.git
-      version: 3.12.0-1
+      version: 3.13.0-1
     source:
       type: git
       url: https://github.com/ros-controls/ros2_controllers.git

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
@@ -5294,6 +5294,7 @@ libqt5-svg:
   arch: [qt5-svg]
   debian: [libqt5svg5]
   fedora: [qt5-qtsvg]
+  nixos: [qt5.qtsvg]
   opensuse: [libqt5-qtsvg]
   rhel: [qt5-qtsvg]
   ubuntu: [libqt5svg5]
@@ -6917,6 +6918,20 @@ pkg-config:
     slackpkg:
       packages: [pkg-config]
   ubuntu: [pkg-config]
+pmccabe:
+  alpine: [pmccabe]
+  arch:
+    aur: [pmccabe]
+  debian: [pmccabe]
+  nixos: [pmccabe]
+  opensuse:
+    '*': [pmccabe]
+    '15.2': null
+    '15.3': null
+  osx:
+    homebrew:
+      packages: [pmccabe]
+  ubuntu: [pmccabe]
 pmount:
   arch:
     aur: [pmount]

diff --git a/rosdep/python.yaml b/rosdep/python.yaml
@@ -6637,6 +6637,15 @@ python3-matplotlib:
     '7': null
   slackware: [python3-matplotlib]
   ubuntu: [python3-matplotlib]
+python3-mccabe:
+  arch: [python-mccabe]
+  debian: [python3-mccabe]
+  fedora: [python3-mccabe]
+  gentoo: [dev-python/mccabe]
+  nixos: [python310Packages.mccabe]
+  opensuse: [python3-mccabe]
+  rhel: [python3-mccabe]
+  ubuntu: [python3-mccabe]
 python3-mechanize:
   debian:
     '*': [python3-mechanize]
@@ -8580,6 +8589,20 @@ python3-sqlalchemy-utils:
   nixos: [python3Packages.sqlalchemy-utils]
   opensuse: [python3-SQLAlchemy-Utils]
   ubuntu: [python3-sqlalchemy-utils]
+python3-sqlmodel:
+  debian:
+    '*': [python3-sqlmodel]
+    bullseye:
+      pip:
+        packages: [sqlmodel]
+  ubuntu:
+    '*': [python3-sqlmodel]
+    focal:
+      pip:
+        packages: [sqlmodel]
+    jammy:
+      pip:
+        packages: [sqlmodel]
 python3-squaternion-pip:
   debian:
     pip:
@@ -9020,6 +9043,7 @@ python3-vcstool:
   macports:
     pip:
       packages: [vcstool]
+  nixos: [vcstool]
   osx:
     pip:
       packages: [vcstool]

diff --git a/scripts/check_rosdep.py b/scripts/check_rosdep.py
@@ -79,7 +79,7 @@ def generic_parser(buf, cb):
         if re.search(r'^\s*#', l) is not None:
             continue
         try:
-            s = re.search(r'(?!' + indent_atom + ')[^\s]', l).start()
+            s = re.search(r'(?!' + indent_atom + r')[^\s]', l).start()
         except:
             print_err("line %u: %s" % (i, l))
             raise

diff --git a/test/requirements.txt b/test/requirements.txt
@@ -1,5 +1,4 @@
 catkin-pkg
-nose
 PyGitHub
 pytest
 PyYAML