Noetic migration

ubi-agni · Nov 6, 2023 · 1d32ec7 · 1d32ec7
1 parent 0179688
commit 1d32ec7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.3)
+cmake_minimum_required(VERSION 3.10.2)
 project(pyhsm)
 
 find_package(catkin REQUIRED)
@@ -9,7 +9,7 @@ catkin_python_setup()
 catkin_package()
 
 # Install targets
-install(PROGRAMS scripts/viewer.py
+catkin_install_python(PROGRAMS scripts/viewer.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 #############

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(

diff --git a/src/hsm/core.py b/src/hsm/core.py
@@ -17,8 +17,9 @@
 import signal
 import logging
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+if sys.version_info.major >= 3:
     collections.MutableSet = collections.abc.MutableSet
+    collections.Iterable = collections.abc.Iterable
 
 # Configure logging defaults
 # (rospy logger config disables all unconfigured loggers other than rosout)