Merge tag 'v3.5.3'

Release of version 3.5.3.

.yapfignore

-unitTesting/test_python-syntax_error.py
+tests/test_python-syntax_error.py

CMakeLists.txt

@@ -21,7 +21,6 @@ SET(DOXYGEN_USE_MATHJAX YES)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/python.cmake)
-INCLUDE(cmake/sphinx.cmake)
 
 # Project definition
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
@@ -68,7 +67,6 @@ TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE PYTHON_LIBRARY="${PYTHON_LIBR
 INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
 
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(tests)
 
 PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})

README.md

@@ -2,8 +2,8 @@ dynamic-graph-python
 ====================
 
 [![Building Status](https://travis-ci.org/stack-of-tasks/dynamic-graph-python.svg?branch=master)](https://travis-ci.org/stack-of-tasks/dynamic-graph-python)
-[![Pipeline status](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-python/commits/master)
-[![Coverage report](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-python/master/coverage/)
+[![Pipeline status](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/pipeline.svg)](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/commits/master)
+[![Coverage report](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-python/master/coverage/)
 
 Python bindings for dynamic-graph.
 
@@ -119,4 +119,3 @@ Credits
 -------
 
 This package authors are credited in the [AUTHORS](AUTHORS) file.
-

cmake @ fb4c22c3

-Subproject commit 30355b70d6f78089c790232d0e7bc67719d842b4
+Subproject commit fb4c22c319ec5320f9a85527eb1a4130954846f5

doc/CMakeLists.txt

-# Copyright 2010, 2011, Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST
-
-SPHINX_SETUP()
-SPHINX_FINALIZE()

doc/sphinx/conf.py.in

-# -*- coding: utf-8 -*-
-#
-# @PROJECT_NAME@ documentation build configuration file, created by
-# sphinx-quickstart on Mon Nov 22 16:45:27 2010.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-from sphinx import version_info as sphinx_version
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path = [os.path.abspath('@CMAKE_BINARY_DIR@/src')]+sys.path
-sys.path = [os.path.abspath('@CMAKE_SOURCE_DIR@/src')]+sys.path
-
-# -- General configuration -----------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo']
-extensions.append('sphinx.ext.pngmath' if sphinx_version < (1, 4) else 'sphinx.ext.imgmath')
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'@PROJECT_NAME@'
-copyright = u'2010, Florent Lamiraux'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '1.0'
-# The full version, including alpha/beta/rc tags.
-release = '1.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_use_modindex = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '@PROJECT_NAME@doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', '@PROJECT_NAME@.tex', u'@PROJECT_NAME@ Documentation',
-   u'Florent Lamiraux', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_use_modindex = True
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}

doc/sphinx/index.rst.in

-.. dynamic-graph-python documentation master file, created by
-   sphinx-quickstart on Mon Nov 22 16:45:27 2010.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to dynamic-graph-python's documentation!
-================================================
-
-.. toctree::
-   :maxdepth: 2
-
-Python module dynamic_graph implements bindings for dynamic-graph_ library. To each main C++ class is associated a Python class. Main classes are listed below.
-
-Entity
-------
-maps dynamicgraph::Entity_ C++ class.
-
-.. autoclass:: dynamic_graph.entity.Entity
-   :members:
-
-SignalBase
-----------
-maps dynamicgraph::SignalBase_ C++ class.
-
-.. autoclass:: dynamic_graph.signal_base.SignalBase
-   :members:
-
-Other funtions of the module
-----------------------------
-.. automodule:: dynamic_graph
-   :members:
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
-.. _dynamic-graph: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/index.html
-.. _Entity: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/classdynamicgraph_1_1_entity.html
-.. _SignalBase: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/classdynamicgraph_1_1_signal_base.html

package.xml

-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
   <name>dynamic-graph-python</name>
-  <version>3.5.2</version>
+  <version>3.5.3</version>
   <description>
     Dynamic graph library Python bindings
   </description>
@@ -11,17 +12,20 @@
   <author>Nicolas Mansard</author>
   <author>Olivier Stasse</author>
 
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamic-graph</build_depend>
-
-  <exec_depend>roscpp</exec_depend>
-  <exec_depend>dynamic-graph</exec_depend>
-
-  <build_export_depend>roscpp</build_export_depend>
-  <build_export_depend>dynamic-graph</build_export_depend>
-
-  <buildtool_depend>catkin</buildtool_depend>
-
+  <build_depend>git</build_depend>
+  <build_depend>doxygen</build_depend>
   <doc_depend>doxygen</doc_depend>
+  <!-- The following tags are recommended by REP-136 -->
+  <exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
+  <exec_depend condition="$ROS_VERSION == 2">ament_cmake</exec_depend>
+  <depend>dynamic-graph</depend>
+  <depend>roscpp</depend>
+  <depend>boost</depend>
+  
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
 
 </package>

src/CMakeLists.txt

@@ -16,6 +16,6 @@ FOREACH(source ${PYTHON_SOURCES})
 ENDFOREACH(source)
 
 # --- ADD the wrap on the dg modules
-LINK_DIRECTORIES(${DYNAMIC_GRAPH_PLUGINDIR})
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer" tracer tracer-wrap)
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" tracer-real-time tracer_real_time-wrap)
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer" dynamic-graph::tracer tracer-wrap)
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" dynamic-graph::tracer-real-time
+  tracer_real_time-wrap)

src/dynamic_graph/debug-py.cc

@@ -22,8 +22,8 @@ namespace dynamicgraph {
 namespace python {
 
 #if PY_MAJOR_VERSION == 2
-  extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
 
 namespace debug {
 
@@ -35,7 +35,7 @@ PyObject* addLoggerFileOutputStream(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   char* filename;
   if (!PyArg_ParseTuple(args, "s", &filename)) return NULL;
   std::string sfilename(filename);
@@ -58,7 +58,7 @@ PyObject* closeLoggerFileOutputStream(
 #else
     PyObject*, PyObject*
 #endif
-    ) {
+) {
   try {
     for (std::map<std::string, ofstreamShrPtr>::iterator it = mapOfFiles_.begin(); it != mapOfFiles_.end(); ++it) {
       it->second->close();
@@ -74,7 +74,7 @@ PyObject* addLoggerCoutOutputStream(
 #else
     PyObject*, PyObject*
 #endif
-    ) {
+) {
   try {
     dgADD_OSTREAM_TO_RTLOG(std::cout);
   }
@@ -88,7 +88,7 @@ PyObject* realTimeLoggerDestroy(
 #else
     PyObject*, PyObject*
 #endif
-    ) {
+) {
   try {
     RealTimeLogger::destroy();
   }
@@ -102,7 +102,7 @@ PyObject* realTimeLoggerSpinOnce(
 #else
     PyObject*, PyObject*
 #endif
-    ) {
+) {
   try {
     RealTimeLogger::instance().spinOnce();
   }
@@ -116,7 +116,7 @@ PyObject* realTimeLoggerInstance(
 #else
     PyObject*, PyObject*
 #endif
-    ) {
+) {
   try {
     RealTimeLogger::instance();
   }

src/dynamic_graph/dynamic-graph-py.cc

@@ -15,8 +15,8 @@ namespace dynamicgraph {
 namespace python {
 
 #if PY_MAJOR_VERSION == 2
-  PyObject* dgpyError;
-# endif
+PyObject* dgpyError;
+#endif
 
 /**
    \brief plug a signal into another one.
@@ -27,7 +27,7 @@ PyObject* plug(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* objOut = NULL;
   PyObject* objIn = NULL;
   void* pObjOut;
@@ -51,20 +51,20 @@ PyObject* plug(
   pObjIn = PyCapsule_GetPointer(objIn, "dynamic_graph.Signal");
   SignalBase<int>* signalIn = (SignalBase<int>*)pObjIn;
   if (signalIn == NULL) {
-      std::ostringstream oss;
-      oss << "dynamic_graph.plug(a, b): Argument 'b' must be of type 'dynamic_graph.Signal', but got "
-          << PyCapsule_GetName(objIn);
-      PyErr_SetString(PyExc_TypeError, oss.str().c_str());
-      return NULL;
+    std::ostringstream oss;
+    oss << "dynamic_graph.plug(a, b): Argument 'b' must be of type 'dynamic_graph.Signal', but got "
+        << PyCapsule_GetName(objIn);
+    PyErr_SetString(PyExc_TypeError, oss.str().c_str());
+    return NULL;
   }
   pObjOut = PyCapsule_GetPointer(objOut, "dynamic_graph.Signal");
   SignalBase<int>* signalOut = (SignalBase<int>*)pObjOut;
   if (signalOut == NULL) {
-      std::ostringstream oss;
-      oss << "dynamic_graph.plug(a, b): Argument 'a' must be of type 'dynamic_graph.Signal', but got "
-          << PyCapsule_GetName(objOut);
-      PyErr_SetString(PyExc_TypeError, oss.str().c_str());
-      return NULL;
+    std::ostringstream oss;
+    oss << "dynamic_graph.plug(a, b): Argument 'a' must be of type 'dynamic_graph.Signal', but got "
+        << PyCapsule_GetName(objOut);
+    PyErr_SetString(PyExc_TypeError, oss.str().c_str());
+    return NULL;
   }
   std::ostringstream os;
 
@@ -81,7 +81,7 @@ PyObject* enableTrace(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* boolean;
   char* filename = NULL;
 

src/dynamic_graph/entity-py.cc

@@ -33,8 +33,8 @@ namespace python {
 using namespace convert;
 
 #if PY_MAJOR_VERSION == 2
-  extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
 
 namespace entity {
 
@@ -47,7 +47,7 @@ PyObject* create(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   char* className = NULL;
   char* instanceName = NULL;
 
@@ -85,7 +85,7 @@ PyObject* getName(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   void* pointer = NULL;
   std::string name;
@@ -115,7 +115,7 @@ PyObject* getClassName(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   void* pointer = NULL;
   std::string name;
@@ -145,7 +145,7 @@ PyObject* hasSignal(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   char* name = NULL;
   PyObject* object = NULL;
   void* pointer = NULL;
@@ -181,7 +181,7 @@ PyObject* getSignal(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   char* name = NULL;
   PyObject* object = NULL;
   void* pointer = NULL;
@@ -213,7 +213,7 @@ PyObject* listSignals(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   void* pointer = NULL;
   PyObject* object = NULL;
 
@@ -246,9 +246,9 @@ PyObject* executeCommand(
 #if PY_MAJOR_VERSION >= 3
     PyObject* m, PyObject* args
 #else
-    PyObject* , PyObject* args
+    PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   PyObject* argTuple = NULL;
   char* commandName = NULL;
@@ -344,7 +344,7 @@ PyObject* getCommandDocstring(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   char* commandName;
   if (!PyArg_ParseTuple(args, "Os", &object, &commandName)) {
@@ -380,7 +380,7 @@ PyObject* getDocString(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   if (!PyArg_ParseTuple(args, "O", &object)) {
     return NULL;
@@ -411,7 +411,7 @@ PyObject* display(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   /* Retrieve the entity instance. */
   PyObject* object = NULL;
   if (!PyArg_ParseTuple(args, "O", &object) || (!PyCapsule_CheckExact(object))) {
@@ -438,7 +438,7 @@ PyObject* setLoggerVerbosityLevel(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   PyObject* objectVerbosityLevel = NULL;
   if (!PyArg_ParseTuple(args, "OO", &object, &objectVerbosityLevel)) return NULL;
@@ -500,7 +500,7 @@ PyObject* getLoggerVerbosityLevel(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
 
@@ -532,7 +532,7 @@ PyObject* getStreamPrintPeriod(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
 
@@ -563,7 +563,7 @@ PyObject* setStreamPrintPeriod(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   double streamPrintPeriod = 0;
   if (!PyArg_ParseTuple(args, "Od", &object, &streamPrintPeriod)) return NULL;
@@ -603,7 +603,7 @@ PyObject* getTimeSample(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
 
@@ -634,7 +634,7 @@ PyObject* setTimeSample(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PyObject* object = NULL;
   double timeSample;
   if (!PyArg_ParseTuple(args, "Od", &object, &timeSample)) return NULL;

src/dynamic_graph/pool-py.cc

@@ -11,8 +11,8 @@ namespace dynamicgraph {
 namespace python {
 
 #if PY_MAJOR_VERSION == 2
-  extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
 
 namespace pool {
 
@@ -22,7 +22,7 @@ PyObject* writeGraph(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   char* filename;
   if (!PyArg_ParseTuple(args, "s", &filename)) return NULL;
   try {
@@ -41,7 +41,7 @@ PyObject* getEntityList(
 #else
     PyObject*, PyObject* args
 #endif
-  ) {
+) {
   if (!PyArg_ParseTuple(args, "")) return NULL;
 
   std::vector<std::string> entityNames;

src/dynamic_graph/signal-base-py.cc

@@ -22,8 +22,8 @@ namespace dynamicgraph {
 namespace python {
 
 #if PY_MAJOR_VERSION == 2
-  extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
 
 using namespace convert;
 
@@ -96,7 +96,7 @@ PyObject* createSignalWrapper(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   PythonSignalContainer* psc = getPythonSignalContainer();
   if (psc == NULL) return NULL;
 
@@ -159,7 +159,7 @@ PyObject* setTime(
 #else
     PyObject*, PyObject* args
 #endif
-    ) {
+) {
   void* pointer = NULL;
   PyObject* object = NULL;