From dac10b3606ca235e9d2569caf95273b4bd061d03 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Fri, 20 Dec 2024 10:05:18 +0100 Subject: [PATCH] Imported upstream version '1.14.19' of 'upstream' --- .github/workflows/ci.yaml | 2 +- .github/workflows/format.yaml | 4 ++-- .pre-commit-config.yaml | 4 ++-- CHANGELOG.rst | 5 +++++ package.xml | 2 +- src/xacro/__init__.py | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a47aa40..424fcb91 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: env: ROS_DISTRO: ${{ matrix.ros }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: industrial_ci uses: ros-industrial/industrial_ci@master diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 29d08d8e..409319ec 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -10,5 +10,5 @@ jobs: name: pre-commit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: pre-commit/action@v3.0.0 + - uses: actions/checkout@v4 + - uses: pre-commit/action@v3.0.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 79211e69..f0ffaa4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/pycqa/flake8 - rev: 4.0.1 + rev: 7.1.1 hooks: - id: flake8 args: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1e46bb8a..b606b042 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package xacro ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.14.19 (2024-12-20) +-------------------- +* Add function python.vars() (`#348 `_) +* Contributors: Robert Haschke + 1.14.18 (2024-04-02) -------------------- * Add more unit tags for yaml files (`#331 `_) diff --git a/package.xml b/package.xml index 3d62d6d5..2e0f66af 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ xacro - 1.14.18 + 1.14.19 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/src/xacro/__init__.py b/src/xacro/__init__.py index c91cd882..92a40bb5 100644 --- a/src/xacro/__init__.py +++ b/src/xacro/__init__.py @@ -213,7 +213,7 @@ def expose(*args, **kwargs): # 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', 'abs', 'all', 'any', 'complex', 'divmod', 'enumerate', 'filter', 'frozenset', 'hash', 'isinstance', 'issubclass', - 'ord', 'repr', 'reversed', 'slice', 'set', 'sum', 'tuple', 'type', 'zip', source=__builtins__, ns='python') + 'ord', 'repr', 'reversed', 'slice', 'set', 'sum', 'tuple', 'type', 'vars', 'zip', source=__builtins__, ns='python') # Expose all math symbols and functions into namespace math (and directly for backwards compatibility -- w/o deprecation) expose([(k, v) for k, v in math.__dict__.items() if not k.startswith('_')], ns='math', deprecate_msg='')