Skip to content

Commit

Permalink
Rebase from 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Jan 25, 2024
1 parent 2fd460c commit cbbf884
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package xacro
^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.14.17 (2024-01-25)
--------------------
* Expose python.abs()
* Contributors: Robert Haschke

1.14.16 (2023-05-24)
--------------------
* Fix hasattr support of YamlDictWrapper (`#324 <https://github.com/ros/xacro/issues/324>`_)
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>xacro</name>
<version>1.14.16</version>
<version>1.14.17</version>
<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.
Expand Down
2 changes: 1 addition & 1 deletion src/xacro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def expose(*args, **kwargs):
expose('sorted', 'range', source=__builtins__, ns='python', deprecate_msg=deprecate_msg)
# Expose all builtin symbols into the python namespace. Thus the stay accessible if the global symbol was overriden
expose('list', 'dict', 'map', 'len', 'str', 'float', 'int', 'True', 'False', 'min', 'max', 'round',
'all', 'any', 'complex', 'divmod', 'enumerate', 'filter', 'frozenset', 'hash', 'isinstance', 'issubclass',
'abs', 'all', 'any', 'complex', 'divmod', 'enumerate', 'filter', 'frozenset', 'hash', 'isinstance', 'issubclass',
'ord', 'repr', 'reversed', 'slice', 'set', 'sum', 'tuple', 'type', 'zip', source=__builtins__, ns='python')

# Expose all math symbols and functions into namespace math (and directly for backwards compatibility -- w/o deprecation)
Expand Down

0 comments on commit cbbf884

Please sign in to comment.