Merge branch 'master' into fix-python3-ros-google-cloud

jsk-ros-pkg · Jul 25, 2023 · d1ca3e2 · d1ca3e2
2 parents cc249d2 + 77c1dfb
commit d1ca3e2
Show file tree

Hide file tree

Showing 79 changed files with 166 additions and 48 deletions.
diff --git a/3rdparty/aques_talk/CHANGELOG.rst b/3rdparty/aques_talk/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package aques_talk
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/3rdparty/aques_talk/package.xml b/3rdparty/aques_talk/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="1">
   <name>aques_talk</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>ROS interface aques_talk demo program
   </description>
   <author email="[email protected]">AQUEST Corp, ROS package maintained by Kei Okada</author>

diff --git a/3rdparty/assimp_devel/CHANGELOG.rst b/3rdparty/assimp_devel/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package assimp_devel
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/3rdparty/assimp_devel/package.xml b/3rdparty/assimp_devel/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>assimp_devel</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>assimp library</description>
   <license>BSD</license>
   <maintainer email="[email protected]">Kei Okada</maintainer>

diff --git a/3rdparty/downward/CHANGELOG.rst b/3rdparty/downward/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package downward
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/downward/package.xml b/3rdparty/downward/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>downward</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>fast downward: PDDL Planner (http://www.fast-downward.org)</description>
   <maintainer email="[email protected]">Yohei Kakiuchi</maintainer>
 

diff --git a/3rdparty/ff/CHANGELOG.rst b/3rdparty/ff/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ff
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/ff/package.xml b/3rdparty/ff/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>ff</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>ff: pddl planner. see http://www.loria.fr/~hoffmanj/ff.html</description>
 
   <maintainer email="[email protected]">Kei Okada</maintainer>

diff --git a/3rdparty/ffha/CHANGELOG.rst b/3rdparty/ffha/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ffha
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/ffha/package.xml b/3rdparty/ffha/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>ffha</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>ffha: PDDL Planner (http://ipc.informatik.uni-freiburg.de)</description>
   <maintainer email="[email protected]">Yohei Kakiuchi</maintainer>
 

diff --git a/3rdparty/google_cloud_texttospeech/CHANGELOG.rst b/3rdparty/google_cloud_texttospeech/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package google_cloud_texttospeech
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/google_cloud_texttospeech/package.xml b/3rdparty/google_cloud_texttospeech/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="1">
   <name>google_cloud_texttospeech</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>The google_cloud_texttospeech package</description>
 
   <maintainer email="[email protected]">Shingo Kitagawa</maintainer>

diff --git a/3rdparty/julius/CHANGELOG.rst b/3rdparty/julius/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package julius
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+* fix build farm (`#487 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/487>`_)
+  * julius: fix location URLs, because osdn is too slow
+
+* Contributors: Kei Okada
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/julius/package.xml b/3rdparty/julius/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>julius</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>julius: Open-Source Large Vocabulary CSR Engine (http://julius.sourceforge.jp/index.php)</description>
   <maintainer email="[email protected]">Kei Okada</maintainer>
 

diff --git a/3rdparty/libcmt/CHANGELOG.rst b/3rdparty/libcmt/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package libcmt
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/libcmt/package.xml b/3rdparty/libcmt/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>libcmt</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>libCMT ROS Wrapper</description>
   <maintainer email="[email protected]">Yuto Inagaki</maintainer>
 

diff --git a/3rdparty/libsiftfast/CHANGELOG.rst b/3rdparty/libsiftfast/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package libsiftfast
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/3rdparty/libsiftfast/package.xml b/3rdparty/libsiftfast/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>libsiftfast</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>
     Library to compute SIFT features
   </description>

diff --git a/3rdparty/lpg_planner/CHANGELOG.rst b/3rdparty/lpg_planner/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package lpg_planner
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/lpg_planner/package.xml b/3rdparty/lpg_planner/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>lpg_planner</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>lpg_planner: LPGL Planner (http://zeus.ing.unibs.it/lpg/)</description>
   <maintainer email="[email protected]">Hitoshi Kamada</maintainer>
 

diff --git a/3rdparty/mini_maxwell/CHANGELOG.rst b/3rdparty/mini_maxwell/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package mini_maxwell
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/mini_maxwell/package.xml b/3rdparty/mini_maxwell/package.xml
@@ -7,7 +7,7 @@
      mini_maxwell
 
   </description>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <author email="[email protected]">Yusuke Furuta</author>
   <maintainer email="[email protected]">Ryohei Ueda</maintainer>
   <license>BSD</license>

diff --git a/3rdparty/nlopt/CHANGELOG.rst b/3rdparty/nlopt/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package nlopt
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/nlopt/package.xml b/3rdparty/nlopt/package.xml
@@ -4,7 +4,7 @@
   <description>
     nlopt
   </description>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <maintainer email="[email protected]">Noda Shintaro</maintainer>
   <license>MIT</license>
   <url type="website">http://ros.org/wiki/nlopt</url>

diff --git a/3rdparty/osqp/CHANGELOG.rst b/3rdparty/osqp/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package osqp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/osqp/package.xml b/3rdparty/osqp/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>osqp</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>ROS wrapper for OSQP</description>
   <maintainer email="[email protected]">Moju Zhao</maintainer>
 

diff --git a/3rdparty/slic/CHANGELOG.rst b/3rdparty/slic/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package slic
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/slic/package.xml b/3rdparty/slic/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>slic</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>SLIC-Superpizel ROS Wrapper
   This file contains the class elements of the class Slic. This class is an
   implementation of the SLIC Superpixel algorithm by Achanta et al. [PAMI'12,

diff --git a/3rdparty/voice_text/CHANGELOG.rst b/3rdparty/voice_text/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package voice_text
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/voice_text/package.xml b/3rdparty/voice_text/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>voice_text</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>voice_text (www.voicetext.jp)</description>
   <maintainer email="[email protected]">Kei Okada</maintainer>
 

diff --git a/3rdparty/zdepth/CHANGELOG.rst b/3rdparty/zdepth/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package zdepth
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+* fix build farm : ROS_DISTRO needs ros_environment (`#487 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/487>`_)
+* Contributors: Kei Okada
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/3rdparty/zdepth/package.xml b/3rdparty/zdepth/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>zdepth</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>The zdepth package</description>
 
   <maintainer email="[email protected]">Shingo Kitagawa</maintainer>

diff --git a/bayesian_belief_networks/CHANGELOG.rst b/bayesian_belief_networks/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package bayesian_belief_networks
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/bayesian_belief_networks/package.xml b/bayesian_belief_networks/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>bayesian_belief_networks</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>The bayesian_belief_networks package form https://github.com/eBay/bayesian-belief-networks, Authored by Neville Newey, Anzar Afaq, Copyright 2013 eBay Software Foundation</description>
 
   <maintainer email="[email protected]">Kei Okada</maintainer>

diff --git a/chaplus_ros/CHANGELOG.rst b/chaplus_ros/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package chaplus_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 

diff --git a/chaplus_ros/package.xml b/chaplus_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>chaplus_ros</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>The ROS package for chaplus service</description>
 
   <maintainer email="[email protected]">Kei Okada</maintainer>

diff --git a/dialogflow_task_executive/CHANGELOG.rst b/dialogflow_task_executive/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package dialogflow_task_executive
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/dialogflow_task_executive/package.xml b/dialogflow_task_executive/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package format="1">
   <name>dialogflow_task_executive</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>A ROS package for Google Dialogflow and launching apps via Dialogflow</description>
 
   <maintainer email="[email protected]">Shingo Kitagawa</maintainer>

diff --git a/gdrive_ros/CHANGELOG.rst b/gdrive_ros/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package gdrive_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.28 (2023-07-24)
+-------------------
+* use query with folder + title, instead of list all files then apply filters (`#481 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/481>`_)
+* Contributors: Kei Okada
+
 2.1.27 (2023-06-24)
 -------------------
 * fix package.xml/CMakeLists.txt to supress catkin_lint errors (`#479 <https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/479>`_)

diff --git a/gdrive_ros/node_scripts/gdrive_server_node.py b/gdrive_ros/node_scripts/gdrive_server_node.py
@@ -252,15 +252,8 @@ def _get_parents_id(self, parents_path, parents_id=None, mkdir=False):
 
         folder_title = parents_path[0]
         parent = parents_id if parents_id else 'root'
-        gfiles = self.gdrive.ListFile(
-            {'q': "'{}' in parents and trashed=false".format(parent)})
-        gfiles = gfiles.GetList()
-        gfolders = []
-        for gf in gfiles:
-            if (gf['mimeType'] == self.folder_mime_type
-                    and gf['title'] == folder_title):
-                gfolders.append(gf)
-
+        gfolders = self.gdrive.ListFile(
+            {'q': "'{}' in parents and mimeType = '{}' and title = '{}' and trashed=false".format(parent, self.folder_mime_type, folder_title)}).GetList()
         if len(parents_path) == 1:
             if len(gfolders) > 0:
                 return gfolders[0]['id']

diff --git a/gdrive_ros/package.xml b/gdrive_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="1">
   <name>gdrive_ros</name>
-  <version>2.1.27</version>
+  <version>2.1.28</version>
   <description>Google drive upload and download package</description>
 
   <maintainer email="[email protected]">Shingo Kitagawa</maintainer>