From a2590fcf1013527a97c68edb2631bc004bb76a5b Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 25 Jan 2024 03:03:47 +0100 Subject: [PATCH] Generated debian files for focal --- debian/changelog | 804 ++++++++++++++++++++++++++ debian/changelog.em | 7 - debian/compat | 1 + debian/compat.em | 1 - debian/control | 13 + debian/control.em | 14 - debian/{copyright.em => copyright} | 12 +- debian/gbp.conf | 3 + debian/gbp.conf.em | 3 - debian/{rules.em => rules} | 20 +- debian/source/format | 1 + debian/source/format.em | 1 - debian/source/{options.em => options} | 3 +- 13 files changed, 838 insertions(+), 45 deletions(-) create mode 100644 debian/changelog delete mode 100644 debian/changelog.em create mode 100644 debian/compat delete mode 100644 debian/compat.em create mode 100644 debian/control delete mode 100644 debian/control.em rename debian/{copyright.em => copyright} (50%) create mode 100644 debian/gbp.conf delete mode 100644 debian/gbp.conf.em rename debian/{rules.em => rules} (75%) create mode 100644 debian/source/format delete mode 100644 debian/source/format.em rename debian/source/{options.em => options} (81%) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..f1bb8998 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,804 @@ +ros-noetic-xacro (1.14.17-1focal) focal; urgency=high + + * Expose python.abs() + * Contributors: Robert Haschke + + -- Robert Haschke Wed, 24 Jan 2024 23:00:00 -0000 + +ros-noetic-xacro (1.14.16-1focal) focal; urgency=high + + * Fix hasattr support of YamlDictWrapper (#324 ) + * Contributors: Alec Tiefenthal, Robert Haschke + + -- Robert Haschke Tue, 23 May 2023 22:00:00 -0000 + +ros-noetic-xacro (1.14.15-1focal) focal; urgency=high + + * Evaluate ``arg`` value as str/unicode (#322 ) + * Remove obsolete options from completion + * Contributors: Robert Haschke + + -- Robert Haschke Sun, 26 Feb 2023 23:00:00 -0000 + +ros-noetic-xacro (1.14.14-1focal) focal; urgency=high + + * Dotted YAML access from list iterator (#318 ) + * Link to extended wiki + * Contributors: Robert Haschke + + -- Robert Haschke Thu, 20 Oct 2022 22:00:00 -0000 + +ros-noetic-xacro (1.14.13-1focal) focal; urgency=high + + * Only optionally activate comment evaluation (#310 )Comment evaluation can be enabled with a special comment: + + * ```` or + * ```` + It remains active for the following comments until: + + * the current XML tag's scope is left (or a new tag entered) + * another tag or non-whitespace text is processed + * it becomes explicitly disabled via: ```` + + * Fix property resolution with namespace usage (#308 ) + + * Allow access to properties in parent scopes again (fixes #305 ) + * Pick correct scope when defining a property into the parent (fixes #307 )Setting a property within the parent scope may occur in two contexts:From within a macro. In that case, one wants to set the property in the caller's scope. + + From within the included file. In that case, one wants to set the property in the includer's scope. + + * Contributors: Robert Haschke + + -- Robert Haschke Fri, 11 Feb 2022 23:00:00 -0000 + +ros-noetic-xacro (1.14.12-1focal) focal; urgency=high + + * Issue a warning only for evaluation errors in comments + * Add LICENSE file + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 29 Jan 2022 23:00:00 -0000 + +ros-noetic-xacro (1.14.11-1focal) focal; urgency=high + + * Fix resolving of macros and properties declared and used in/from a namespace (#297 , #306 )Macros and properties that are declared within a namespaced include shouldn't require the namespace prefix when used within the namespace. + * Perform expression evaluation in comments (#300 ) + * Expose ``xacro.arg()`` to facilitate access to substitution args + * Fix scoped macro evaluation + + * Replace ``[Macro|Property]NameSpace`` with common ``NameSpace`` class derived from ``Table`` + * Use the scoped macro Table + + * Contributors: Robert Haschke + + -- Robert Haschke Wed, 19 Jan 2022 23:00:00 -0000 + +ros-noetic-xacro (1.14.10-1focal) focal; urgency=high + + * Allow property names to be evaluated from an expression + This allows to turn macros into a function that can compute an arbitrary property: + + + + + + + + * Fix error reporting for invalid symbols in NameSpaces + * Allow removal of a property definition (#288 ) + * Allow greedy property evaluation (#284 ) + This can be used, to redefine a property from its previous value, e.g. for normalization: + + + + * Correctly expose XML namespaces imported via ``xacro:include`` within a macro (#287 ) + * Throw when attempting to declare a property starting with *double* underscore (#286 ) + * Improve global symbols (#283 ) + + * Expose most builtin symbols of python + * Expose xacro functions into ``xacro`` namespace + + * ``xacro.print_location()`` to print the current filestack + * ``tokenize(string, sep=',; ', skip_empty=True)`` to facilitate string tokenization + * ``message()``, ``warning()``, ``error()``, and ``fatal()`` to output messages on ``stderr``. + All but ``message()`` print the error location (macro call and file hierarchy) by default: + + ${xacro.message('message', 'text', 2, 3.14, color=32, print_location=True)} + ${xacro.warning('warning')} + ${xacro.error('error', print_location=False)} + ${xacro.fatal('fatal')} + + + * Rework handling of file and macro stack, such that print_location() works from anywhere + * Unit tests: Reduce reported ``stdout``/``stderr`` output + * Rework definition of ``global_symbols`` to expose functions into namespaces python, math, xacro + + * Contributors: Robert Haschke + + -- Robert Haschke Fri, 01 Oct 2021 22:00:00 -0000 + +ros-noetic-xacro (1.14.9-1focal) focal; urgency=high + + * Allow more builtin symbols: sorted, set + * Don't import hidden symbols from math package + * Fix ``eval()`` security vulnerability + + * ``safe_eval()``: Forbid symbol names starting with *double* underscore + * unit tests validating the protection mechanism + + * Generalize yaml ``!degrees`` constructor: Enable expressions as well + * Contributors: Robert Haschke + + -- Robert Haschke Thu, 02 Sep 2021 22:00:00 -0000 + +ros-noetic-xacro (1.14.8-1focal) focal; urgency=high + + * Improve macro arg parsing (#278 ) to support: + + * ``$(substitution args)`` + * ``${python expressions}`` + * single or double quoting of spaces + + * Contributors: Robert Haschke + + -- Robert Haschke Sun, 18 Jul 2021 22:00:00 -0000 + +ros-noetic-xacro (1.14.7-1focal) focal; urgency=high + + * [feature] Expose YamlDictWrapper as dotify() to allow dotted access to any dict (#274 ) + * [fix] Scoped macro evaluation (#272 ) + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 29 May 2021 22:00:00 -0000 + +ros-noetic-xacro (1.14.6-1focal) focal; urgency=high + + * [fix] Report correct filename for XML errors (#268 ) + * [fix] Python3-compatible property Table (#266 ) + * [fix] Use outer-scope symbols to resolve include filename in ``xacro:include`` (#264 ) + * Contributors: Robert Haschke + + -- Robert Haschke Mon, 01 Mar 2021 23:00:00 -0000 + +ros-noetic-xacro (1.14.5-1focal) focal; urgency=high + + * [fix] yaml loading: recursively wrap lists and dicts for dotted dict access (#258 ) + * [feature] Provide support for yaml constructors ``!degrees`` and ``!radians`` (#252 ) + * Contributors: Robert Haschke, G.A. vd. Hoorn + + -- Robert Haschke Mon, 12 Oct 2020 22:00:00 -0000 + +ros-noetic-xacro (1.14.4-1focal) focal; urgency=high + + * [fix] Rework YamlDictWrapper to restore dict properties (#250 ) + * [fix] Ignore underscores when parsing literal numeric values (#247 ) + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 08 Aug 2020 22:00:00 -0000 + +ros-noetic-xacro (1.14.3-1focal) focal; urgency=high + + * [feature] Improve warnings + + * Unify meaning of verbosity > 0 (to print file location) + * Provide file location on warning in check_attrs() + * Issue warning on child elements of tag + + * [feature] Allow dotted access to yaml-loaded dicts: d.key1.key2.key3 (#245 ) + * [maint] Travis: Update distro to Bionic + * Contributors: Robert Haschke, G.A. vd. Hoorn + + -- Robert Haschke Sat, 04 Jul 2020 22:00:00 -0000 + +ros-noetic-xacro (1.14.2-1focal) focal; urgency=high + + * [maintanence] Remove deprecated xacro.py (#239 ) + * Contributors: Shane Loretz + + -- Robert Haschke Wed, 20 May 2020 22:00:00 -0000 + +ros-noetic-xacro (1.14.1-1focal) focal; urgency=high + + * [feature] allow optional xacro includes (#234 ) + * [maintanence] Use setuptools instead of distutils (#233 ) + * [maintanence] fix Travis: export correct ROS_PYTHON_VERSION + * Contributors: Alejandro Hernández Cordero, Robert Haschke + + -- Robert Haschke Sat, 28 Mar 2020 23:00:00 -0000 + +ros-noetic-xacro (1.14.0-1focal) focal; urgency=high + + * [maintanence] Remove deprecations + + * Require all xacro commands to be prefixed with 'xacro:' + * Remove options --legacy, --inorder, --check-order, --includes + + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 07 Dec 2019 23:00:00 -0000 + +ros-noetic-xacro (1.13.5-1focal) focal; urgency=high + + * [feature] Expose abs_filename() (#220 ) + * [feature] Catch missing closing brace in $() and ${} expressions + * [maintanence] + + * Replace deprecated yaml.load() -> yaml.safe_load() + * Save macro names internally w/o 'xacro:' prefix + * Correctly issue deprecation warning for non-prefixed xacro tags + + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 07 Dec 2019 23:00:00 -0000 + +ros-noetic-xacro (1.13.4-1focal) focal; urgency=high + + * [feature] remove xmlns:xacro from processed file (#207 ) + + * Remove all notions of xmlns:xacro from the resulting document. + * If the root node defines a xacro:targetNamespace attribute, this will become the global xmlns namespace of the resulting document. + + * [feature] Add len() to allowed python functions (#208 ) + * [maintanence] + + * ``--in-order`` warning: reduce severity level to message + * fix and cleanup test of cmake extensions + * adapt run_xacro() to run xacro from PATH + * simplify import of substition_args + * remove 'requires' field from setup.py + * fix Travis config: use new repository key, use xenial/kinetic distro + * basic README.md + * fix catkin_lint issue + * remove duplicate catkin_python_setup() (#206 ) + + * Contributors: Robert Haschke, James Xu, Martin Pecka + + -- Robert Haschke Wed, 25 Sep 2019 22:00:00 -0000 + +ros-noetic-xacro (1.13.3-1focal) focal; urgency=high + + * use INORDER as default in cmake functions + * remove weird 'None's in error messages + * Contributors: Robert Haschke + + -- Robert Haschke Sat, 13 Oct 2018 22:00:00 -0000 + +ros-noetic-xacro (1.13.2-1focal) focal; urgency=high + + * deprecate --includes option (which is tied to deprecated --legacy processing) + * moved all option handling to cli.py, including deprecation warnings for options + * Contributors: Robert Haschke + + -- Robert Haschke Sun, 13 May 2018 22:00:00 -0000 + +ros-noetic-xacro (1.13.1-1focal) focal; urgency=high + + * fix parsing of quoted strings in default args for xacro params (#187 ) + * Contributors: Robert Haschke + + -- Robert Haschke Wed, 02 May 2018 22:00:00 -0000 + +ros-noetic-xacro (1.13.0-1focal) focal; urgency=high + + * make --inorder processing the default + * Contributors: Robert Haschke + + -- Robert Haschke Fri, 30 Mar 2018 22:00:00 -0000 + +ros-noetic-xacro (1.12.1-1focal) focal; urgency=high + + * #183 : unicode support for python2 and python3 + * #178 : extend list of allowed python builtins: min, max, round + * #182 : suppress xacro warnings when determining dependencies + * #151 : fixes for #149 and #148 + * #157 : fix #156 access to undefined target_table + * #150 : allow True/False literals in python expressions + * #159 : load ROS-related packages on demand, thus becoming more independent from ROS + * #173 : allow default values for properties + * #172 : fix formatting of XacroException + * #171 : fix dependency handling (--deps option) + * #163 : full python 3 compatibility + * Contributors: Robert Haschke, Kartik Mohta, Morgan Quigley, Steven Peters + + -- Robert Haschke Tue, 27 Mar 2018 22:00:00 -0000 + +ros-noetic-xacro (1.12.0-1focal) focal; urgency=high + + + + -- Robert Haschke Fri, 24 Mar 2017 23:00:00 -0000 + +ros-noetic-xacro (1.11.2-1focal) focal; urgency=high + + * Convert exception to string in a python2/3 compatible way. + * Use python2/3 independent check for file type. + * Contributors: Hans Gaiser, Maarten de Vries + + -- Robert Haschke Sun, 26 Feb 2017 23:00:00 -0000 + +ros-noetic-xacro (1.11.1-1focal) focal; urgency=high + + * workaround for xml.dom.minidom issue + * ensure non-empty error string + * Contributors: Robert Haschke + + -- Robert Haschke Tue, 21 Jun 2016 22:00:00 -0000 + +ros-noetic-xacro (1.11.0-1focal) focal; urgency=high + + * added short option -i as alternative to --inorder + * refactored main to fix #122, #107 + * added xacro indicator to error message to fix #123 + * moved banner generation to process_file() + * removed special (but obsolete) output handling for just_includes mode + * moved core processing pipeline into function process_file() + * improved documentation: more comments, input_file -> input_file_name + * fix #120: handle non-space whitespace characters in params string + * extended tests to handle non-space whitespace characters in params string + * always store macros with xacro: prefix in front: #118 + * fix #115: enforce xacro namespace usage with --xacro-ns option + * apply correct checking for include tags, and extend testcase + * allow (one-level) nested expression/extension evaluation + * Contributors: Robert Haschke, Morgan Quigley + + -- Robert Haschke Thu, 24 Mar 2016 23:00:00 -0000 + +ros-noetic-xacro (1.10.6-1focal) focal; urgency=high + + * use correct catkin environment for cmake dependency checking + * fixed dependency definition for cmake usage + * Contributors: Robert Haschke + + -- Robert Haschke Mon, 31 Aug 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.5-1focal) focal; urgency=high + + * fix #108: evaluate property blocks recursively too + * improved macro parameter parsing + * use a regular expression to parse a param spec with forwarding and default + * allow for spaces in default string (within single quotes) + * forwarding macro arguments from outer scope + * switched to ^| syntax + * use more compact $| syntax + * moved parsing of argument defaults to grab_macro() + * explicit forwarding of properties to macro scope + * replace silent/implicit forwarding of properties from outer scope to + macro scope by an explicit "call" to a forward([,]) function. + * implicit forwarding of outer-scope properties to macro args (#100) + * property evaluation fixes + * suppress double evaluation of properties + * adapted unittest to cover the fixed issue + * fixed evaluation order for properties exported to parent or global scope + * Merge pull request #103 from ubi-agni/overwrite-check + issue warning when attempting to overwrite existing global property + * fixed unittest: avoid overwrite warning + * warn when overwriting any globally defined variable + * Merge pull request #102 from ubi-agni/completion + bash completion + * Merge pull request #99 from ubi-agni/jade-devel + reworked macro resolution + * moved test_macro_name_with_colon() to class TestXacro + should be tested both, in oldorder and inorder mode + * bash completion + * improved error message for failed $(find) + * reworked macro resolution + python-eval-based macro resolution (introduced to enable namespaces) + heavily restricted the set of possible macro names (only valid python + identifiers were allowed) + Particularly, xacro: prefixed macro names were forbidden. + * initial attempt to fix #97 + * add failing test case with colon in the macro name + * Contributors: Robert Haschke + + -- Robert Haschke Tue, 11 Aug 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.4-1focal) focal; urgency=high + + * removed test_DEPRECATED_should_replace_before_macroexpand() + duplicates test_should_replace_before_macroexpand() + * fixed evaluation order of macro arguments and body + Macro arguments need to be evaluated and assigned to properties before + body is evaluated. Otherwise, the evaluated value will be converted to + str, i.e. loosing original type. + * Contributors: Robert Haschke + + -- Robert Haschke Wed, 17 Jun 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.3-1focal) focal; urgency=high + + * deprecate ``--oldorder`` processing + * added ``--check-order`` option to do a simple check for ``--inorder`` compatibility + + * Most probable incompatibility is redefining a property after its usage. + * tested and reported with file location of (first) redefinition after usage. + + * moved command line processing to cli.py + * explain verbosity levels in usage string + * colorize errors during cli parsing + * log definition and usage of properties + * replaced debug option by verbosity options -q, -v + * fixed evaluation time of default macro params + * introduced Macro object to increase code readability + * parse a macro's parameter list once at declaration time (instead of every instantiation) + * extended test_multiple_blocks() to check for both normal and reversed order + * added unittest to increase code coverage + * do not issue deprecation warning for tags that are non-xacro + * added option --oldorder + * allow to store properties to parent or global scope + * added + * cleaned up error message about missing files + * moved xml-specific functions to xmlutils.py + new generic functions opt_attrs(), reqd_attrs(), and check_attrs() + to fetch optional and required attributes and warn about unknown ones + in a uniform fashion + * unittest to allow empty defaults + * Merge pull request #94 from ubi-agni/minor-fixes + * minor fixes + * remove duplicates in --deps output + * fixed dependency checking for --inorder mode (which requires full processing) + * fixed doc of xacro' cmake macros + * renamed "xacro:rename" to "xacro:element" + * allow namespacing for xacro:include's + * allow renaming of element names using xacro:rename + * unittest cleanup + * check property and macro names to be valid python identifiers + * allow namespacing of xacro:include's + * properties and macros in an included file will go into their own, + separate namespace, if the XML attribute ns is provided. + Access is by standard python syntax: namespace.name + * allow renaming of element names + + * moved unittests requiring --inorder processing to class TestXacroInorder + * added unittest test_dynamic_macro_undefined() + * improved error message when variable include filename is used + without --inorder + * stripped down unittest test_inorder_processing() + * improved processing + * adapted pr2 gold standard removing most comments again + this partially reverts 59605fb1521583dc63efdea13f4c45128499bd20 + * remove all XML comments directly before xacro elements + (These are considered xacro-related only and should be removed in the final doc.) + Leaving an empty line between xacro-unrelated and xacro-related comments + allows to include the former. + * unittest: test_ignore_xacro_comments() + * improved processing + + * recursive (instead of iterative) eval_all() + * reusable process_include() + * replace_node() function to replace xacro tag by some other content + * avoid reprocessing of nodes + * avoid deep copy where possible (speedup) + + * fix evaluation (#83) + * yaml support + * check for consistency of xml namespaces on xacro:include + * replaced strip()=='' by more efficient isspace() + * allow transitive definition of substition args + * fixed evaluation of literals in property definitions + + * literals with preceding whitespace will be silently stripped (#83) + * more complex evaluation test (perturbing spaces added) + + * fixed xacro namespaces in pr2 files to get rid of new inconsistency warning + * warning message on inconsistent namespace redefinition for includes + * yaml support + ${load_yaml('file.yaml')} to load dict from yaml file + * Merge pull request #85 from ubi-agni/error-reporting + improved error reporting + * nicer formatting of multiple "when evaluating expression" lines + * improved formatting of error messages + use XacroException to wrap and augment other exceptions + to achieve a clearer error formatting + * better error message for missing substitution args + * use colorized warnings where possible + * included macro stack in error-reporting + * maintain filestack to facilitate error reporting at any time + * Merge pull request #82 from ubi-agni/unittests + improved unittesting + * allow to capture (and check) stderr in unit tests + * improved unittests to test both, classic and in-order processing + * Merge pull request #81 from ubi-agni/jade-devel + Thank you for your time and contributions. Improving cosmetics is important. + * PEP8 cleanup + * cmake: only copy files to devel space if new + * Merge pull request #80 from ubi-agni/jade-devel + * improved error-handling opening the output file + - running multiple xacro process in parallel, all writing into a new dir + could cause a race condition when creating the dir + - improved error message on output creation failure + * removed rospy dependency + - Importing rospy caused build order issues with ros_comm in workspace + * Filtering out REMAP command-line arguments is done manually now. + * update authors/maintainers and copyright statements + * deprecate non-namespaced xacro tags + * added missing print_location_msg() for file that actually failed parsing + * improved deprecation warnings + * New cli option --xacro-ns allows to enforce the new policy + requiring the xacro namespace prefix (and suppressing deprecation warnings). + However, non-prefixed tags will not be modified by xacro anymore + (as requested by #41, #59, #60). + Partially reverted cb73cfd8c678adfda2172accef398189ea2338a1, handling + tags in the same fashion as other tags, i.e. issue a warning if + used without prefix and ignoring it with cli argument --xacro-ns. + * fixed pr2 xacro files to use 'xacro:' prefixed tags only + * fixed unittests in test_xacro.py to use 'xacro:' prefixed tags only + * deprecation message for missing xacro namespace prefix in xml tags + * moved colored warning messages into color.py (for reuseability) + * added missing print_location_msg() for file that actually failed parsing + * improved xacro's cmake macros + * prepend ${PACKAGE_NAME} to all generated cmake targets + Otherwise multiple packages employing xacro's cmake macros will use the + same conflicting target name. + This is only an issue with catkin_make, which defines a single global + cmake namespace. The new catkin tools (or catkin_make_isolated) build + each package separately. + * basic unittest for xacro's cmake macros + * improved xacro's cmake macros + - xacro_add_xacro_file() automatically determines output file from input (removing .xacro suffix). + If that fails, a fatal error is raised. + - added xacro_install() to allow installation into both, devel and install space. + - replaced conveniency function xacro_add_files() + * Contributors: Robert Haschke + + -- Robert Haschke Mon, 15 Jun 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.2-1focal) focal; urgency=high + + * added --debug option to explicitly enable stack traces + By default, only show error message to the user. + Stack traces are only interesting for xacro developers. + * recursive include processing + - more informed error messages (which file was included from where) + - allows relative path names for include filename specs + they are interpreted relative to the current file + * new substitution command $(cwd) to extract current working directory + * added unittest cases + - creation of required subdirs for output + - recursive xacro:include + - extended test_include_glob() to check for all glob patterns + * added run_xacro() function to simplify unittests running xacro script + * moved xacro.py back to original location + * nicely colored deprecation warning + * create required dirs before opening output file + * added convenience cmake-macro xacro_add_target() + to auto-generate xacro-processed files + * added cmake status message before launching xacro + (xacro might run for quite a while) + * fetch xacro --deps errors at report them as a warning + * simplified deprecation message + * added missing return statement + * removed obsolete math import + left over from deaaae2c69edd7d5e185eeb098c1521d8711608b + * install xacro.py again (for backwards compatibility) + usage of xacro.py issues a deprecation warning + * simplified scripts/xacro - removed xacro.py + - made run script "scripts/xacro" and install process follow standards + - removed xacro.py + - added dependencies to setup.py + Having the binaries xacro and xacro.py installed side by side causes + problems, because xacro.py is wrongly taken as the module. + This was avoided by the rather complex filtering of the sys.path. + Switched to ROS standard now, using a binary script called "xacro". + * changed tests to use the whole xacro processing pipeline + utilizing the modularization of main() from previous commit + This simplifies several existing tests, especially these using files on disk. + * split main() into process_cli_arg(), parse(), process_doc() + * extended cmake macro xacro_add_xacro_file() + - handle INORDER option + - handle REMAP arguments + - create absolute input file names automatically + usage: xacro_add_xacro_file(input output INORDER REMAP ...) + * stripped new unit tests to essential xml snippets + * merged pull request #68 : eval properties assigned from tags as literals + In the following example: + + + ${val} was not evaluated as a number, but as string only. + Thus numerical expressions failed with an exception. + * factored out get_boolean_value() + * needs to be fully specified + * (handling tags (without xacro ns-prefix) disabled native tags) + add test for eating launch parameter arguments + remove check for "arg" parameter. + move new test function to bottom of source + * added unit tests for evaluation of list, tuple, and dict literals + * fixed some code style issues + * fixed string-isinstance checks (for python 3 compatibility) + * do not evaluate list, dict, tuple expressions as literals (without ${} syntax) + * added dict to list of known global symbols + * focused global_symbols definition in the beginning of the file + added some basic python symbols: list, str, float, int and map + allowing some basic computation + * tuning performance: instantiate QuickLexer's regexps only once + * Contributors: Robert Haschke, Martin Pecka, Mike O'Driscoll, Morgan Quigley + + -- Robert Haschke Fri, 22 May 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.1-1focal) focal; urgency=high + + * improved error handling and more descriptive error messages + * correctly raise a XacroException on invalid, i.e. non-boolean, expressions. + (removed left-over debugging code, added test case) + * raise an exception on undefined, but used macros + Using the syntax should raise an exception if + macroname is not defined. Added appropriate code and a test case. + * fixed bookkeeping in lazy evaluation + switch Table.unevaluated from list to set to avoid multiple key entries + * fix formatting of changelog + * Contributors: Robert Haschke + + -- Robert Haschke Tue, 31 Mar 2015 22:00:00 -0000 + +ros-noetic-xacro (1.10.0-1focal) focal; urgency=high + + * security measure: forbid access to __builtins__ in expressions + * literal evaluation should only consider literals, but no expressions use ast.literal_eval() + * removed eval() from xacro:if evaluation + * back to string comparison to handle (lowercase) true and false + * add test case for equality expressions in + * add test case for math function usage + * python based evaluation of expressions + - replaced handle_expr with python-internal eval() call + - care has been taken to resolve variables recursively on demand (in Table.__getitem__) + - allows for evaluation of standard math functions + - other desired functions could be added in eval_self_contained + - Values in Table symbols are not stored as strings but as typed values. + * If text is required, a conversion with str() is performed, to ensure + proper evaluation of expressions. Otherwise 3*"1" would evaluate to "111". + * use __future__.division we can handle integer division evaluating to + floating-point devision, as before + * allow variable names for filename attribute in + * allow for ordered XML processing to avoid issues with multiply defined + properties and macros in (typically 3rd party) include files + - enable the new behaviour by passing --inorder cmdline option + - to improve code readibility and reusability, introduced functions + * process_include(node), grab_macro(elt, macros), grab_property(elt, symbols) + containing 1:1 corresponding handling from process_includes, grab_macros, + and grab_properties + - added corresponding test case test_inorder_processing() + * dynamic macro names using + * fixup unittests and handling of non-element nodes in , , + * updated pr2 gold standard to include all comments + * allow to ignore comments in nodes_match() + * New handling of non-element nodes invalidates pr2 gold standard (adding + a lot more comments). To allow validation, allow to ignore all + comments in comparison (as before). + * fixed handling of non-element nodes in , , + * fixed writexml: text nodes were not printed when other siblings exist + - print all text, but skip whitespace-only text nodes + * improved xml matching + - so far only element nodes (with its attributes) were considered + - now also consider TEXT, CDATA, and COMMENT nodes + - added function text_matches (normalizing consecutive whitespace to a single space) + - added some new unit tests + - test_consider_non_elements: + non-element nodes are not yet considered in and + * travis-ci: use catkin_make + * travis-ci: fixup running of tests + * fix pathnames used in test case + * Include CATKIN_ENV params at build time. + * use output filename flag instead of shell redirection + * create output file after parsing is complete, not before + * Contributors: Robert Haschke, Mike O'Driscoll, Morgan Quigley, William Woodall + + -- Robert Haschke Thu, 12 Mar 2015 23:00:00 -0000 + +ros-noetic-xacro (1.9.3-1focal) focal; urgency=high + + * merge test cases + * add a snapshot of the pr2 model to the test directory. add a test case which verifies that the pr2 model is parsed equal to a 'golden' parse of it. + * add more tests + * add default arg tests + * Allow default values for substitution args + * Fix up comments + * Allow xacro macros to have default parameters + * Contributors: Paul Bovbel, Morgan Quigley + + -- Robert Haschke Tue, 13 Jan 2015 23:00:00 -0000 + +ros-noetic-xacro (1.9.2-1focal) focal; urgency=high + + * add a few more tests to exercise the symbol table a bit more + * allow for recursive evaluation of properties in expressions + * add useful debugging information when parameters are not set + * stop test from failing the second time it is run + * unified if/unless handling, correctly handle floating point expressions + * floating point expressions not equal zero are now evaluated as True + * changed quotes to omit cmake warning + * Contributors: Robert Haschke, Mike Ferguson + + -- Robert Haschke Thu, 10 Jul 2014 22:00:00 -0000 + +ros-noetic-xacro (1.9.1-1focal) focal; urgency=high + + * fixup tests so they run + * export architecture_independent flag in package.xml + * installed relocatable fix + * Contributors: Michael Ferguson, Mike Purvis, Scott K Logan + + -- Robert Haschke Fri, 20 Jun 2014 22:00:00 -0000 + +ros-noetic-xacro (1.9.0-1focal) focal; urgency=high + + * Remove the roslint_python glob, use the default one. + * Add roslint target to xacro; two whitespace fixes so that it passes. + * fix evaluation of integers in if statements + also added a unit test, fixes #15 + * fix setting of _xacro_py CMake var, fixes #16 + * Add support for globbing multiple files in a single + * code cleanup and python3 support + * check for CATKIN_ENABLE_TESTING + + -- Robert Haschke Thu, 27 Mar 2014 23:00:00 -0000 + +ros-noetic-xacro (1.8.4-1focal) focal; urgency=high + + * Merge pull request #9 from davetcoleman/hydro-devel + Xacro should not use plain 'include' tags but only namespaced ones. + * Fix for the fact that minidom creates text nodes which count as child nodes + * Removed checking and made it more general for any child element of an tag + * Removed Groovy reference, only being applied to Hydro + * Created check for Gazebo's tabs only only shows deprecated warnings if not present. + * Small spelling fix + * Xacro should not use plain 'include' tags but only namespaced ones. + * Merge pull request #8 from piyushk/hydro-devel-conditional + xacro conditional blocks + * using refined arguments instead of sys.argv for xml file location + * adding conditional blocks to xacro + + -- Robert Haschke Mon, 05 Aug 2013 22:00:00 -0000 + +ros-noetic-xacro (1.8.3-1focal) focal; urgency=high + + * bumped version to 1.8.3 for hydro release + * backwards compatilibity with rosbuild + * adding unit test for substitution args + * Adding supoprt for substitution_args 'arg' fields + * Remove bin copy of xacro.py + * 1.7.3 + * Install xacro.py as a program so it can be run + * 1.7.2 + * fixed build issues introduced in catkinization + * 1.7.1 + * PEP8, cleanup, and remove roslib + * Update copyright, self import guard, and catkinize + * Catkinize. + * Cleanup in preparation of catkinization. + * Added tag unstable for changeset 169c4bf30367 + * Added tag xacro-1.6.1 for changeset fc45af7fdada + * 1.6.1 marker + * xacro: fuerte compat with sub args import + * Added tag unstable for changeset 2d3c8dbfa3c9 + * Added tag xacro-1.6.0 for changeset e4a4455189bf + * 1.6.0 + * converted to unary stack from common stack + * xacro: fixed inserting property blocks (ros-pkg #4561 ) + * xacro now uses XacroExceptions. String exceptions are not allowed in Python anymore. #4209 + * Added Ubuntu platform tags to manifest + * Xacro now places comments below tag (#3859 ) + * Xacro prints out cleaner xml. + Elements are now often separated by a newline. + * xacro dependency on roslaunch removed #3451 + * Xacro now adds a message mentioning that the file was autogenerated (#2775 ) + * Remove use of deprecated rosbuild macros + * Integers stay integers in xacro, fixing #3287 + * Tests for r25868 + * Added a flag for only evaluating include tags in xacro + * Allowing multiple blocks and multiple insert_blocks, fixing #3322 and #3323 + * doc review completed for xacro + * adding mainpage for xacro doc review + * Added xacro.cmake file that exports new xacro_add_xacro_file() macro, #3020 + * Namespaced "include" tag in xacro + * Marked xacro as api reviewed + * Xacro now correctly declares the namespaces of the included documents in the final + * Made xacro accept xml namespaces + * Xacro now errors hard when a property is used without being declared + * Xacro no longer allows you to create properties with "${}" in the name + * Added the ability to escape "${" in xacro + * Made the tests in xacro run again. + * Created xacro/src + * migration part 1 + + -- Robert Haschke Sun, 21 Apr 2013 22:00:00 -0000 + + diff --git a/debian/changelog.em b/debian/changelog.em deleted file mode 100644 index 35859090..00000000 --- a/debian/changelog.em +++ /dev/null @@ -1,7 +0,0 @@ -@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)@(DebianInc)@(Distribution)) @(Distribution); urgency=high - -@(changelog) - - -- @(main_name) <@(main_email)> @(change_date) - -@[end for] diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/compat.em b/debian/compat.em deleted file mode 100644 index 7a87216d..00000000 --- a/debian/compat.em +++ /dev/null @@ -1 +0,0 @@ -@(debhelper_version) diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..1556d7f0 --- /dev/null +++ b/debian/control @@ -0,0 +1,13 @@ +Source: ros-noetic-xacro +Section: misc +Priority: optional +Maintainer: Robert Haschke +Build-Depends: debhelper (>= 9.0.0), ros-noetic-catkin (>= 0.5.68), ros-noetic-roslint, ros-noetic-rostest +Homepage: http://ros.org/wiki/xacro +Standards-Version: 3.9.2 + +Package: ros-noetic-xacro +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ros-noetic-roslaunch +Description: Xacro (XML Macros) Xacro is an XML macro language. + With xacro, you can construct shorter and more readable XML files by using macros that expand to larger XML expressions. diff --git a/debian/control.em b/debian/control.em deleted file mode 100644 index 6d7b65c3..00000000 --- a/debian/control.em +++ /dev/null @@ -1,14 +0,0 @@ -Source: @(Package) -Section: misc -Priority: optional -Maintainer: @(Maintainer) -Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends)) -Homepage: @(Homepage) -Standards-Version: 3.9.2 - -Package: @(Package) -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends)) -@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@ -@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@ -Description: @(Description) diff --git a/debian/copyright.em b/debian/copyright similarity index 50% rename from debian/copyright.em rename to debian/copyright index bc82fd5d..17be8ac6 100644 --- a/debian/copyright.em +++ b/debian/copyright @@ -1,11 +1,9 @@ Format: Bloom subset of https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: @(Name) -@[if BugTracker]Upstream-Contact: @(BugTracker)@\n@[end if]@ -@[if Source]Source: @(Source)@\n@[end if]@ -@[for License, Text in Licenses]@ +Upstream-Name: xacro +Upstream-Contact: https://github.com/ros/xacro/issues +Source: https://github.com/ros/xacro Files: See file headers in repository for details Copyright: See package copyright in source code for details -License: @(License) - @(Text) -@[end for]@ +License: BSD + See repository for full license text diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..fac88210 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[git-buildpackage] +upstream-tag=release/noetic/xacro/1.14.17-1 +upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em deleted file mode 100644 index ad24a164..00000000 --- a/debian/gbp.conf.em +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=@(release_tag) -upstream-tree=tag diff --git a/debian/rules.em b/debian/rules similarity index 75% rename from debian/rules.em rename to debian/rules index 276329db..9b929a01 100755 --- a/debian/rules.em +++ b/debian/rules @@ -13,7 +13,7 @@ export DH_VERBOSE=1 # https://code.ros.org/trac/ros/ticket/2977 # https://code.ros.org/trac/ros/ticket/3842 export LDFLAGS= -export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig +export PKG_CONFIG_PATH=/opt/ros/noetic/lib/pkgconfig # Explicitly enable -DNDEBUG, see: # https://github.com/ros-infrastructure/bloom/issues/327 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG @@ -24,24 +24,24 @@ endif DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) %: - dh $@@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE) + dh $@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE) override_dh_auto_configure: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ dh_auto_configure -- \ -DCATKIN_BUILD_BINARY_PACKAGE="1" \ - -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \ - -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \ + -DCMAKE_INSTALL_PREFIX="/opt/ros/noetic" \ + -DCMAKE_PREFIX_PATH="/opt/ros/noetic" \ $(BUILD_TESTING_ARG) override_dh_auto_build: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ dh_auto_build override_dh_auto_test: @@ -49,19 +49,19 @@ override_dh_auto_test: # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. echo -- Running tests. Even if one of them fails the build is not canceled. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ dh_auto_test || true override_dh_shlibdeps: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/ + if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ + dh_shlibdeps -l$(CURDIR)/debian/ros-noetic-xacro//opt/ros/noetic/lib/ override_dh_auto_install: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/format.em b/debian/source/format.em deleted file mode 100644 index 9666bf41..00000000 --- a/debian/source/format.em +++ /dev/null @@ -1 +0,0 @@ -3.0 (@(format)) diff --git a/debian/source/options.em b/debian/source/options similarity index 81% rename from debian/source/options.em rename to debian/source/options index 8c4c78b0..8bc9182a 100644 --- a/debian/source/options.em +++ b/debian/source/options @@ -1,6 +1,5 @@ -@[if format and format == 'quilt']@ # Automatically add upstream changes to the quilt overlay. # http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html # This supports reusing the orig.tar.gz for debian increments. auto-commit -@[end if] +