Improved licencse matching

[zflat]

I am using the approach described in https://answers.ros.org/question/343351/whats-the-proper-way-to-use-a-proprietary-software-license-according-to-ament_copyright/?answer=343355#post-id-343355 to add a proprietary license for my organization that can be enforced with ament_copyright. One issue I am running into is that the license header has multiple references to a copyright statement so the current license matching fails.

I would like to update the license matching to split the license header into sections separated by {copyright_holder} or {copyright}. The current matching only splits into sections by {coyright_holder}.

Here is an abbreviated example of the license header template I need this to work with:

 {copyright}
 ALL RIGHTS RESERVED
 
 
 THIS UNPUBLISHED WORK BY {copyright_holder} IS PROTECTED. IF PUBLICATION OF THE WORK SHOULD
 OCCUR, THE FOLLOWING NOTICE SHALL APPLY.
 
  "{copyright} ALL RIGHTS RESERVED."
 
 {copyright_holder} DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.

[audrow]

Looks okay to me. Would you add tests to confirm that this is working as expected.

Also, I ran CI, just to see if anything breaks downstream:

• Linux
• Linux-aarch64
• Windows

[zflat]

@audrow thanks for the review! The branch in #363 adds ament_copyright/test/test_parser.py which is where I would like to put unit tests for this change. Once that #363 is merged I can rebase and add tests to this branch.

[audrow]

@audrow thanks for the review! The branch in #363 adds ament_copyright/test/test_parser.py which is where I would like to put unit tests for this change. Once that #363 is merged I can rebase and add tests to this branch.

Sounds good, @zflat.

By the way, it looks like there are some code style errors in CI: https://ci.ros2.org/job/ci_linux/16480/testReport/junit/ament_copyright.test/test_flake8/test_flake8/.

[zflat]

@clalancette I addressed the code styling with this change: 15d5d7e

I see the more-information-needed label, so does this information answer the open question?

[audrow]

I think the more information needed tag refers to that this is waiting on the tests to be implemented, once the other PR is merged in.

[zflat]

@audrow @methylDragon I added test coverage for the changes in this pull request. Can I please get a re-review?

[methylDragon]

• Linux
• Linux-aarch64
• Windows

[zflat]

@methylDragon Thanks for kicking off CI! Unfortunately, I think this needs a new build because kdl_parse failed to build?

21:36:01 Summary: 142 packages finished [8min 44s]
21:36:01   1 package failed: kdl_parser
21:36:01   3 packages aborted: orocos_kdl rosidl_generator_py rviz_ogre_vendor
21:36:01   38 packages had stderr output: ament_clang_format ament_clang_tidy ament_copyright ament_cppcheck ament_cpplint ament_flake8 ament_index_python ament_lint ament_lint_cmake ament_mypy ament_package ament_pclint ament_pep257 ament_pycodestyle ament_pyflakes ament_uncrustify ament_xmllint domain_coordinator foonathan_memory_vendor google_benchmark_vendor iceoryx_posh ignition_cmake2_vendor ignition_math6_vendor kdl_parser launch launch_pytest launch_testing launch_xml launch_yaml libyaml_vendor mimick_vendor osrf_pycommon pybind11_vendor rosidl_cli rpyutils tracetools_read tracetools_trace zstd_vendor
21:36:01   187 packages not processed

[methylDragon]

Oof

• Linux
• Linux-aarch64
• Windows

[methylDragon]

Nice, new tests pass: https://ci.ros2.org/job/ci_linux/16838/testReport/ament_copyright.test/test_parser/