diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index f2e3d192..d09d7e28 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -13,7 +13,7 @@ on: jobs: pre-commit: name: pre-commit - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ba25cb8e..034f8fbc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,12 +15,12 @@ repos: # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-added-large-files args: ['--maxkb=1000'] - id: check-ast - - id: check-byte-order-marker + - id: fix-byte-order-marker - id: check-builtin-literals - id: check-case-conflict - id: check-docstring-first @@ -40,7 +40,6 @@ repos: - id: end-of-file-fixer - id: mixed-line-ending - id: fix-byte-order-marker - - id: fix-encoding-pragma - id: forbid-new-submodules - id: mixed-line-ending - id: name-tests-test @@ -50,7 +49,7 @@ repos: - id: double-quote-string-fixer - repo: https://github.com/psf/black - rev: 25.1.0 + rev: 25.11.0 hooks: - id: black args: ["--skip-string-normalization"] @@ -71,3 +70,8 @@ repos: - id: codespell args: ['--write-changes'] exclude: CHANGELOG.rst + + - repo: https://github.com/asottile/pyupgrade + rev: v3.21.2 + hooks: + - id: pyupgrade diff --git a/example_cmake_python/cmake_generate_parameter_module_example/custom_validation.py b/example_cmake_python/cmake_generate_parameter_module_example/custom_validation.py index 03eba7c3..ae50ef7c 100644 --- a/example_cmake_python/cmake_generate_parameter_module_example/custom_validation.py +++ b/example_cmake_python/cmake_generate_parameter_module_example/custom_validation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/example_cmake_python/cmake_generate_parameter_module_example/minimal_publisher.py b/example_cmake_python/cmake_generate_parameter_module_example/minimal_publisher.py index e80bb124..0b2e875b 100644 --- a/example_cmake_python/cmake_generate_parameter_module_example/minimal_publisher.py +++ b/example_cmake_python/cmake_generate_parameter_module_example/minimal_publisher.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/example_python/generate_parameter_module_example/custom_validation.py b/example_python/generate_parameter_module_example/custom_validation.py index 03eba7c3..ae50ef7c 100644 --- a/example_python/generate_parameter_module_example/custom_validation.py +++ b/example_python/generate_parameter_module_example/custom_validation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/example_python/generate_parameter_module_example/minimal_publisher.py b/example_python/generate_parameter_module_example/minimal_publisher.py index 35ae3c24..ef2ffade 100644 --- a/example_python/generate_parameter_module_example/minimal_publisher.py +++ b/example_python/generate_parameter_module_example/minimal_publisher.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/example_python/setup.py b/example_python/setup.py index a1702cfc..f57d117e 100644 --- a/example_python/setup.py +++ b/example_python/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import sys from setuptools import setup diff --git a/example_python/test/test_copyright.py b/example_python/test/test_copyright.py index 858d8ea4..d78c79bc 100644 --- a/example_python/test/test_copyright.py +++ b/example_python/test/test_copyright.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Open Source Robotics Foundation, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/example_python/test/test_flake8.py b/example_python/test/test_flake8.py index 743f4f46..26030113 100644 --- a/example_python/test/test_flake8.py +++ b/example_python/test/test_flake8.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Open Source Robotics Foundation, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/example_python/test/test_load_modules.py b/example_python/test/test_load_modules.py index 0d0bdf4a..6edf0af4 100644 --- a/example_python/test/test_load_modules.py +++ b/example_python/test/test_load_modules.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import generate_parameter_module_example print(f'Imported module from: {generate_parameter_module_example.__file__}') diff --git a/example_python/test/test_pep257.py b/example_python/test/test_pep257.py index 17569147..b234a384 100644 --- a/example_python/test/test_pep257.py +++ b/example_python/test/test_pep257.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Open Source Robotics Foundation, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py b/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py index 4d69b7f0..7b8b3d42 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py +++ b/generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from typing import List, Union from jinja2 import Template from typeguard import typechecked diff --git a/generate_parameter_library_py/generate_parameter_library_py/generate_cpp_header.py b/generate_parameter_library_py/generate_parameter_library_py/generate_cpp_header.py index b96237d1..244a188e 100755 --- a/generate_parameter_library_py/generate_parameter_library_py/generate_cpp_header.py +++ b/generate_parameter_library_py/generate_parameter_library_py/generate_cpp_header.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # Copyright 2022 PickNik Inc. # diff --git a/generate_parameter_library_py/generate_parameter_library_py/generate_markdown.py b/generate_parameter_library_py/generate_parameter_library_py/generate_markdown.py index 084b3ae8..f39708d7 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/generate_markdown.py +++ b/generate_parameter_library_py/generate_parameter_library_py/generate_markdown.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # diff --git a/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py b/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py index e0c899d6..07558e17 100755 --- a/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py +++ b/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # Copyright 2022 PickNik Inc. # diff --git a/generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py b/generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py index da4707c7..59b9dfe2 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py +++ b/generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # diff --git a/generate_parameter_library_py/generate_parameter_library_py/python_conversions.py b/generate_parameter_library_py/generate_parameter_library_py/python_conversions.py index 80971f25..37f04055 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/python_conversions.py +++ b/generate_parameter_library_py/generate_parameter_library_py/python_conversions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from typing import List, Union from jinja2 import Template from typeguard import typechecked diff --git a/generate_parameter_library_py/generate_parameter_library_py/python_validators.py b/generate_parameter_library_py/generate_parameter_library_py/python_validators.py index 03e44ec7..f174bcf9 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/python_validators.py +++ b/generate_parameter_library_py/generate_parameter_library_py/python_validators.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # diff --git a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py index 2a44b384..37d95ec3 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py +++ b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2023 PickNik Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/generate_parameter_library_py/generate_parameter_library_py/string_filters_cpp.py b/generate_parameter_library_py/generate_parameter_library_py/string_filters_cpp.py index 003d8a16..1ab82baf 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/string_filters_cpp.py +++ b/generate_parameter_library_py/generate_parameter_library_py/string_filters_cpp.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- def valid_string_cpp(description): """ Filter a string to make it a valid C++ string literal. diff --git a/generate_parameter_library_py/generate_parameter_library_py/test/YAML_parse_error_test.py b/generate_parameter_library_py/generate_parameter_library_py/test/YAML_parse_error_test.py index 7afb8373..4dd8e937 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/test/YAML_parse_error_test.py +++ b/generate_parameter_library_py/generate_parameter_library_py/test/YAML_parse_error_test.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2022 PickNik, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/generate_parameter_library_py/setup.py b/generate_parameter_library_py/setup.py index f1a24f02..e55e761c 100644 --- a/generate_parameter_library_py/setup.py +++ b/generate_parameter_library_py/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from setuptools import find_packages from setuptools import setup diff --git a/generate_parameter_library_py/test/test_copyright.py b/generate_parameter_library_py/test/test_copyright.py index 858d8ea4..d78c79bc 100644 --- a/generate_parameter_library_py/test/test_copyright.py +++ b/generate_parameter_library_py/test/test_copyright.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Open Source Robotics Foundation, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/parameter_traits/include/parameter_traits/parameter_traits.hpp b/parameter_traits/include/parameter_traits/parameter_traits.hpp index f1e731a9..a44b484e 100644 --- a/parameter_traits/include/parameter_traits/parameter_traits.hpp +++ b/parameter_traits/include/parameter_traits/parameter_traits.hpp @@ -43,8 +43,8 @@ template [[deprecated( "When returning tl::expected you can call fmt::format " "directly.")]] auto -ERROR(const std::string& format, Args... args) - -> tl::expected { +ERROR(const std::string& format, + Args... args) -> tl::expected { return tl::make_unexpected(fmt::format(format, args...)); }