Update master to target Noetic (ros-drivers#173)

* Updating CircleCI config to build for noetic on master.

* Updating CirlceCI config to build Noetic.

* Minor updates for Noetic build.

* Missed a source.

.circleci/config.yml

@@ -1,70 +1,37 @@
 version: 2
 jobs:
-  kinetic:
+  noetic:
     docker:
-      - image: ros:kinetic-ros-base
+      - image: ros:noetic-ros-base
     steps:
       - checkout
       - run:
           name: Set Up Container
           command: |
-            apt-get update -qq && apt-get install -y python-catkin-tools
             source `find /opt/ros -name setup.bash | sort | head -1`
             mkdir temp_$CIRCLE_PROJECT_REPONAME
             mv `find -maxdepth 1 -not -name . -not -name temp_$CIRCLE_PROJECT_REPONAME` temp_$CIRCLE_PROJECT_REPONAME/
             mv temp_$CIRCLE_PROJECT_REPONAME/ $CIRCLE_PROJECT_REPONAME/
+            apt-get update -qq
             rosdep install --from-paths . --ignore-src -y
-            cd ..
-            catkin init
-            catkin config --extend /opt/ros/$ROS_DISTRO
+            catkin_init_workspace
       - run:
           name: Build
           command: |
-            cd ..
-            catkin build
-      - run:
-          name: Run Tests
-          command: |
-            source `find /opt/ros -name setup.bash | sort | head -1`
-            cd ..
-            catkin run_tests
-            catkin_test_results
-    working_directory: ~/src
-
-  melodic:
-    docker:
-      - image: ros:melodic-ros-base
-    steps:
-      - checkout
-      - run:
-          name: Set Up Container
-          command: |
-            apt-get update -qq && apt-get install -y python-catkin-tools
             source `find /opt/ros -name setup.bash | sort | head -1`
-            mkdir temp_$CIRCLE_PROJECT_REPONAME
-            mv `find -maxdepth 1 -not -name . -not -name temp_$CIRCLE_PROJECT_REPONAME` temp_$CIRCLE_PROJECT_REPONAME/
-            mv temp_$CIRCLE_PROJECT_REPONAME/ $CIRCLE_PROJECT_REPONAME/
-            rosdep install --from-paths . --ignore-src -y
-            cd ..
-            catkin init
-            catkin config --extend /opt/ros/$ROS_DISTRO
-      - run:
-          name: Build
-          command: |
             cd ..
-            catkin build
+            catkin_make
       - run:
           name: Run Tests
           command: |
             source `find /opt/ros -name setup.bash | sort | head -1`
             cd ..
-            catkin run_tests
+            catkin_make test
             catkin_test_results
     working_directory: ~/src
 
 workflows:
   version: 2
   ros_build:
     jobs:
-      - kinetic
-      - melodic
+      - noetic

joystick_drivers/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.8.3)
 project(joystick_drivers)
 find_package(catkin REQUIRED)
 catkin_metapackage()

wiimote/package.xml

@@ -25,21 +25,19 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>cwiid-dev</build_depend>  
   <build_depend>message_generation</build_depend>
   <build_depend>roslint</build_depend>
 
+  <depend>cwiid-dev</depend>
   <depend>geometry_msgs</depend>
-  <depend>python-cwiid</depend>
-  <depend>python-numpy</depend>
+  <depend>python3-numpy</depend>
   <depend>roscpp</depend>
   <depend>roslib</depend>
   <depend>rospy</depend>
   <depend>sensor_msgs</depend>
   <depend>std_msgs</depend>
   <depend>std_srvs</depend>
 
-  <exec_depend>cwiid</exec_depend>
   <exec_depend>message_runtime</exec_depend>
 
   <export>