Merge remote-tracking branch 'origin/production' into fix_smoother_in…

…itialize_quadratic_20241224
rdiankov · Jan 5, 2025 · 9a8c488 · 9a8c488
2 parents a375497 + b08bee8
commit 9a8c488
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 # Define here the needed parameters
 set (OPENRAVE_VERSION_MAJOR 0)
 set (OPENRAVE_VERSION_MINOR 161)
-set (OPENRAVE_VERSION_PATCH 1)
+set (OPENRAVE_VERSION_PATCH 2)
 set (OPENRAVE_VERSION ${OPENRAVE_VERSION_MAJOR}.${OPENRAVE_VERSION_MINOR}.${OPENRAVE_VERSION_PATCH})
 set (OPENRAVE_SOVERSION ${OPENRAVE_VERSION_MAJOR}.${OPENRAVE_VERSION_MINOR})
 message(STATUS "Compiling OpenRAVE Version ${OPENRAVE_VERSION}, soversion=${OPENRAVE_SOVERSION}")

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3,11 +3,16 @@
 ChangeLog
 #########
 
-Version 0.161.1
+Version 0.161.2
 ===============
 
 - Apply ramp acceleration modification the same way as is done in `SegmentFeasible2` when initializing an input trajectory that is quadratic.
 
+Version 0.161.1
+===============
+
+- Expose toAttributeList from openravepy library.
+
 Version 0.161.0
 ===============
 

diff --git a/python/bindings/include/openravepy/openravepy_int.h b/python/bindings/include/openravepy/openravepy_int.h
@@ -444,10 +444,10 @@ inline py::object toPyVector4(Vector v)
 }
 
 /// \brief converts dictionary of keyvalue pairs
-AttributesList toAttributesList(py::dict odict);
+OPENRAVEPY_API AttributesList toAttributesList(py::dict odict);
 /// \brief converts list of tuples [(key,value),(key,value)], it is possible for keys to repeat
-AttributesList toAttributesList(py::list olist);
-AttributesList toAttributesList(py::object oattributes);
+OPENRAVEPY_API AttributesList toAttributesList(py::list olist);
+OPENRAVEPY_API AttributesList toAttributesList(py::object oattributes);
 
 template <typename T>
 inline py::object ReturnTransform(const T& t)