diff --git a/launch/CHANGELOG.rst b/launch/CHANGELOG.rst index 30bf21d36..ec281e0ab 100644 --- a/launch/CHANGELOG.rst +++ b/launch/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package launch ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- +* Correct typos (backport `#961 `_) (`#963 `_) + * Correct typos (`#961 `_) + (cherry picked from commit b51d67a0fb3c572a8255855ac73364ca53ed3691) + Co-authored-by: Auguste Lalande + Co-authored-by: Alejandro Hernandez Cordero +* Contributors: mergify[bot] + 3.4.10 (2026-01-12) ------------------- * [jazzy] Allow Path in substitutions, instead of requiring cast to str (backport `#873 `_) (`#927 `_) diff --git a/launch/launch/actions/execute_process.py b/launch/launch/actions/execute_process.py index 56b4ced8b..be06a0687 100644 --- a/launch/launch/actions/execute_process.py +++ b/launch/launch/actions/execute_process.py @@ -404,8 +404,8 @@ def parse( if 'additional_env' not in ignore: # Conditions won't be allowed in the `env` tag. - # If that feature is needed, `set_enviroment_variable` and - # `unset_enviroment_variable` actions should be used. + # If that feature is needed, `set_environment_variable` and + # `unset_environment_variable` actions should be used. env = entity.get_attr('env', data_type=List[Entity], optional=True) if env is not None: kwargs['additional_env'] = { diff --git a/launch/launch/launch_introspector.py b/launch/launch/launch_introspector.py index 1abcbcef4..11c6c2d19 100644 --- a/launch/launch/launch_introspector.py +++ b/launch/launch/launch_introspector.py @@ -32,9 +32,9 @@ from .utilities import normalize_to_list_of_substitutions -def indent(lines: List[Text], indention: Text = ' ') -> List[Text]: +def indent(lines: List[Text], indentation: Text = ' ') -> List[Text]: """Indent a list of strings and return them.""" - return ['{}{}'.format(indention, line) for line in lines] + return ['{}{}'.format(indentation, line) for line in lines] def tree_like_indent(lines: List[Text]) -> List[Text]: diff --git a/launch/launch/substitutions/environment_variable.py b/launch/launch/substitutions/environment_variable.py index 013471444..9737f33a1 100644 --- a/launch/launch/substitutions/environment_variable.py +++ b/launch/launch/substitutions/environment_variable.py @@ -63,7 +63,7 @@ def __init__( @classmethod def parse(cls, data: Sequence[SomeSubstitutionsType]): - """Parse `EnviromentVariable` substitution.""" + """Parse `EnvironmentVariable` substitution.""" if len(data) < 1 or len(data) > 2: raise TypeError('env substitution expects 1 or 2 arguments') kwargs = {'name': data[0]} diff --git a/launch/launch/utilities/type_utils.py b/launch/launch/utilities/type_utils.py index cae637376..cafebb620 100644 --- a/launch/launch/utilities/type_utils.py +++ b/launch/launch/utilities/type_utils.py @@ -351,7 +351,7 @@ def get_typed_value( # Unfortunately, mypy is unable to correctly infer that `is_substitution` can -# only return True when the passed tpe is either a substitution or a mixed +# only return True when the passed type is either a substitution or a mixed # list of strings and substitutions. Indeed, there is no way that I could find # using overloads to describe "anything else than the above two types". def is_substitution(x): diff --git a/launch/package.xml b/launch/package.xml index 7f22e5bbf..90a62f91b 100644 --- a/launch/package.xml +++ b/launch/package.xml @@ -2,7 +2,7 @@ launch - 3.4.10 + 3.4.11 The ROS launch tool. Aditya Pande diff --git a/launch/setup.py b/launch/setup.py index 3c27270ba..9b5607249 100644 --- a/launch/setup.py +++ b/launch/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='3.4.10', + version='3.4.11', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/launch_pytest/CHANGELOG.rst b/launch_pytest/CHANGELOG.rst index a2ad94325..92dd7d761 100644 --- a/launch_pytest/CHANGELOG.rst +++ b/launch_pytest/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package launch_pytest ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- +* Backport `#949 `_ (`#967 `_) +* Contributors: Tim Clephas + 3.4.10 (2026-01-12) ------------------- * [jazzy] Allow Path in substitutions, instead of requiring cast to str (backport `#873 `_) (`#927 `_) diff --git a/launch_pytest/launch_pytest/plugin.py b/launch_pytest/launch_pytest/plugin.py index c63fcf002..239ac59e6 100644 --- a/launch_pytest/launch_pytest/plugin.py +++ b/launch_pytest/launch_pytest/plugin.py @@ -17,6 +17,7 @@ import functools import inspect +from _pytest.fixtures import getfixturemarker from _pytest.outcomes import fail from _pytest.outcomes import skip @@ -169,6 +170,16 @@ def get_launch_test_fixturename(item): return None if fixture is None else fixture.__name__ +def get_launch_test_fixture_scope(fixture): + """Return launch fixture scope for multiple pytest fixture representations.""" + fixture_marker = getfixturemarker(fixture) + if fixture_marker is None: + raise AttributeError( + f'Unable to retrieve fixture scope from fixture {fixture!r}.' + ) + return fixture_marker.scope + + def is_valid_test_item(obj): """Return true if obj is a valid launch test item.""" return ( @@ -236,7 +247,7 @@ def pytest_pycollect_makeitem(collector, name, obj): return [item] fixture = get_launch_test_fixture(item) fixturename = fixture.__name__ - scope = fixture._pytestfixturefunction.scope + scope = get_launch_test_fixture_scope(fixture) is_shutdown = has_shutdown_kwarg(item) items = generate_test_items( collector, name, obj, fixturename, is_shutdown=is_shutdown, needs_renaming=False) @@ -264,7 +275,7 @@ def is_same_launch_test_fixture(left_item, right_item): return False if lfn is not rfn: return False - if lfn._pytestfixturefunction.scope == 'function': + if get_launch_test_fixture_scope(lfn) == 'function': return False name = lfn.__name__ @@ -326,7 +337,7 @@ def pytest_pyfunc_call(pyfuncitem): return shutdown_test = is_shutdown_test(pyfuncitem) fixture = get_launch_test_fixture(pyfuncitem) - scope = fixture._pytestfixturefunction.scope + scope = get_launch_test_fixture_scope(fixture) event_loop = pyfuncitem.funcargs['event_loop'] ls = pyfuncitem.funcargs['launch_service'] auto_shutdown = fixture._launch_pytest_fixture_options['auto_shutdown'] diff --git a/launch_pytest/package.xml b/launch_pytest/package.xml index 5ffcde9e5..95827af78 100644 --- a/launch_pytest/package.xml +++ b/launch_pytest/package.xml @@ -2,7 +2,7 @@ launch_pytest - 3.4.10 + 3.4.11 A package to create tests which involve launch files and multiple processes. Aditya Pande diff --git a/launch_pytest/setup.py b/launch_pytest/setup.py index 2ab67a293..e5f713637 100644 --- a/launch_pytest/setup.py +++ b/launch_pytest/setup.py @@ -9,7 +9,7 @@ setup( name=package_name, - version='3.4.10', + version='3.4.11', packages=find_packages(exclude=['test']), data_files=[ ('share/ament_index/resource_index/packages', [f'resource/{package_name}']), diff --git a/launch_testing/CHANGELOG.rst b/launch_testing/CHANGELOG.rst index 591b69070..4028f332f 100644 --- a/launch_testing/CHANGELOG.rst +++ b/launch_testing/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package launch_testing ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- +* Correct typos (backport `#961 `_) (`#963 `_) + * Correct typos (`#961 `_) + (cherry picked from commit b51d67a0fb3c572a8255855ac73364ca53ed3691) + Co-authored-by: Auguste Lalande + Co-authored-by: Alejandro Hernandez Cordero +* Contributors: mergify[bot] + 3.4.10 (2026-01-12) ------------------- diff --git a/launch_testing/launch_testing/asserts/assert_sequential_output.py b/launch_testing/launch_testing/asserts/assert_sequential_output.py index 35c1a825b..686395035 100644 --- a/launch_testing/launch_testing/asserts/assert_sequential_output.py +++ b/launch_testing/launch_testing/asserts/assert_sequential_output.py @@ -69,7 +69,7 @@ def assertInStdout(self, msg): def get_nearby_lines(self): - # This works by concatinating a few of the process_io outputs that we received, then + # This works by concatenating a few of the process_io outputs that we received, then # searching forward and backward for two return-lines in each direction, then returning # just that portion to give context about where a failure happened diff --git a/launch_testing/launch_testing/markers.py b/launch_testing/launch_testing/markers.py index d07096708..9c5cbcc0f 100644 --- a/launch_testing/launch_testing/markers.py +++ b/launch_testing/launch_testing/markers.py @@ -30,7 +30,7 @@ def retry_on_failure(*, times, delay=None): """ Mark a test case to be retried up to `times` on AssertionError. - :param times: The number of times to rety the test. + :param times: The number of times to retry the test. :param delay: The time to wait between retries, in seconds. A value of None will result in zero delay. """ diff --git a/launch_testing/launch_testing/test_runner.py b/launch_testing/launch_testing/test_runner.py index 5a1de18b7..0e93a596e 100644 --- a/launch_testing/launch_testing/test_runner.py +++ b/launch_testing/launch_testing/test_runner.py @@ -225,7 +225,7 @@ def __init__(self, """ Create an LaunchTestRunner object. - :param callable gen_launch_description_fn: A function that returns a ros2 LaunchDesription + :param callable gen_launch_description_fn: A function that returns a ros2 LaunchDescription for launching the processes under test. This function should take a callable as a parameter which will be called when the processes under test are ready for the test to start diff --git a/launch_testing/package.xml b/launch_testing/package.xml index 3a8853c7e..158693edd 100644 --- a/launch_testing/package.xml +++ b/launch_testing/package.xml @@ -2,7 +2,7 @@ launch_testing - 3.4.10 + 3.4.11 A package to create tests which involve launch files and multiple processes. Aditya Pande diff --git a/launch_testing/setup.py b/launch_testing/setup.py index 6dba8bf8e..a716c4a9b 100644 --- a/launch_testing/setup.py +++ b/launch_testing/setup.py @@ -6,7 +6,7 @@ setup( name='launch_testing', - version='3.4.10', + version='3.4.11', packages=find_packages(exclude=['test']), data_files=[ ('share/ament_index/resource_index/packages', ['resource/launch_testing']), diff --git a/launch_testing/test/launch_testing/test_io_handler_and_assertions.py b/launch_testing/test/launch_testing/test_io_handler_and_assertions.py index 68f262f98..d6bcea59a 100644 --- a/launch_testing/test/launch_testing/test_io_handler_and_assertions.py +++ b/launch_testing/test/launch_testing/test_io_handler_and_assertions.py @@ -106,7 +106,7 @@ def test_only_one_process_had_arguments(self): matches = [t for t in text_lines if 'Called with arguments' in t] print('Called with arguments: {}'.format(matches)) - # Two process have args, because thats how process names are passed down + # Two process have args, because that's how process names are passed down self.assertEqual(2, len(matches)) matches_extra = [t for t in matches if '--extra' in t] diff --git a/launch_testing/test/launch_testing/test_resolve_process.py b/launch_testing/test/launch_testing/test_resolve_process.py index 3ebfc3b4d..5c6558021 100644 --- a/launch_testing/test/launch_testing/test_resolve_process.py +++ b/launch_testing/test/launch_testing/test_resolve_process.py @@ -48,7 +48,7 @@ def test_unlaunched_process_lookup(self): process=lookup_obj ) - # We'll get a good error mesasge here because there were no substitutions in + # We'll get a good error message here because there were no substitutions in # the execute process cmd - it's all text self.assertIn('python -c', str(cm.exception)) @@ -69,7 +69,7 @@ def test_backward_compatible_unlaunched_process_lookup(self): process=lookup_obj ) - # We'll get a good error mesasge here because there were no substitutions in + # We'll get a good error message here because there were no substitutions in # the execute process cmd - it's all text self.assertIn('python -c', str(cm.exception)) diff --git a/launch_testing_ament_cmake/CHANGELOG.rst b/launch_testing_ament_cmake/CHANGELOG.rst index 4b79b36b3..46ae50aef 100644 --- a/launch_testing_ament_cmake/CHANGELOG.rst +++ b/launch_testing_ament_cmake/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package launch_testing_ament_cmake ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- + 3.4.10 (2026-01-12) ------------------- diff --git a/launch_testing_ament_cmake/package.xml b/launch_testing_ament_cmake/package.xml index 1f516221e..0b1d2b0b3 100644 --- a/launch_testing_ament_cmake/package.xml +++ b/launch_testing_ament_cmake/package.xml @@ -2,7 +2,7 @@ launch_testing_ament_cmake - 3.4.10 + 3.4.11 A package providing cmake functions for running launch tests from the build. Aditya Pande diff --git a/launch_xml/CHANGELOG.rst b/launch_xml/CHANGELOG.rst index 93d35ab6d..a1c1cc9e6 100644 --- a/launch_xml/CHANGELOG.rst +++ b/launch_xml/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package launch_xml ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- + 3.4.10 (2026-01-12) ------------------- * [jazzy] Allow Path in substitutions, instead of requiring cast to str (backport `#873 `_) (`#927 `_) diff --git a/launch_xml/package.xml b/launch_xml/package.xml index be04d23a2..c9e426cdd 100644 --- a/launch_xml/package.xml +++ b/launch_xml/package.xml @@ -2,7 +2,7 @@ launch_xml - 3.4.10 + 3.4.11 XML frontend for the launch package. Aditya Pande diff --git a/launch_xml/setup.py b/launch_xml/setup.py index da5319cff..96647f925 100644 --- a/launch_xml/setup.py +++ b/launch_xml/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='3.4.10', + version='3.4.11', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/launch_yaml/CHANGELOG.rst b/launch_yaml/CHANGELOG.rst index 519cb977b..55f4161bc 100644 --- a/launch_yaml/CHANGELOG.rst +++ b/launch_yaml/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package launch_yaml ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- + 3.4.10 (2026-01-12) ------------------- diff --git a/launch_yaml/package.xml b/launch_yaml/package.xml index 8f92196a1..046853ac3 100644 --- a/launch_yaml/package.xml +++ b/launch_yaml/package.xml @@ -2,7 +2,7 @@ launch_yaml - 3.4.10 + 3.4.11 YAML frontend for the launch package. Aditya Pande diff --git a/launch_yaml/setup.py b/launch_yaml/setup.py index a83b9eb6f..89e93688e 100644 --- a/launch_yaml/setup.py +++ b/launch_yaml/setup.py @@ -5,7 +5,7 @@ setup( name=package_name, - version='3.4.10', + version='3.4.11', packages=find_packages(exclude=['test']), data_files=[ ('share/' + package_name, ['package.xml']), diff --git a/test_launch_testing/CHANGELOG.rst b/test_launch_testing/CHANGELOG.rst index 45cb60d1a..680d2c72b 100644 --- a/test_launch_testing/CHANGELOG.rst +++ b/test_launch_testing/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package test_launch_testing ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.4.11 (2026-06-02) +------------------- + 3.4.10 (2026-01-12) ------------------- * [jazzy] Allow Path in substitutions, instead of requiring cast to str (backport `#873 `_) (`#927 `_) diff --git a/test_launch_testing/package.xml b/test_launch_testing/package.xml index b8d5b710c..04eb034a7 100644 --- a/test_launch_testing/package.xml +++ b/test_launch_testing/package.xml @@ -2,7 +2,7 @@ test_launch_testing - 3.4.10 + 3.4.11 Tests for the launch_testing package. Aditya Pande