From 82bb0e3e0976d7692689a40a7e667dd4a48aad98 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 28 Apr 2026 15:20:15 -0700 Subject: [PATCH 1/4] Update Apache license text back to canonical formatting Signed-off-by: Emerson Knapp --- LICENSE | 274 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 201 insertions(+), 73 deletions(-) diff --git a/LICENSE b/LICENSE index 1f89fda..01f9f9f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,73 +1,201 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright 2026 Polymath Robotics, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2026 Polymath Robotics, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From cc24891ba7b7eb7c6db8c84c2357c0b44ad166c3 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 28 Apr 2026 16:12:54 -0700 Subject: [PATCH 2/4] Fix spdx reuse sentinel value reinsertion Signed-off-by: Emerson Knapp --- polymath_code_standard/insert_license.py | 3 +- tests/test_insert_license_wildcard.py | 37 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/polymath_code_standard/insert_license.py b/polymath_code_standard/insert_license.py index d38a65f..ebec572 100644 --- a/polymath_code_standard/insert_license.py +++ b/polymath_code_standard/insert_license.py @@ -471,7 +471,8 @@ def find_license_header_index( def _is_copyright_line(stripped_line: str) -> bool: """Return True if a stripped line is a copyright attribution (any comment style).""" - return stripped_line.lstrip('/#').lstrip().lower().startswith('copyright') + normalized = stripped_line.lstrip('/#').lstrip().lower() + return normalized.startswith('copyright') or normalized.startswith('spdx-filecopyrighttext') def copyright_sentinel_found(src_file_content, top_lines_count): diff --git a/tests/test_insert_license_wildcard.py b/tests/test_insert_license_wildcard.py index f756773..09c490d 100644 --- a/tests/test_insert_license_wildcard.py +++ b/tests/test_insert_license_wildcard.py @@ -70,6 +70,15 @@ def test_non_copyright(self): def test_blank_comment(self): assert not _is_copyright_line('#') + def test_reuse_spdx_hash_style(self): + assert _is_copyright_line('# SPDX-FileCopyrightText: 2026 Acme Corp') + + def test_reuse_spdx_slash_style(self): + assert _is_copyright_line('// SPDX-FileCopyrightText: 2026 Acme Corp') + + def test_reuse_spdx_license_identifier_is_not_copyright(self): + assert not _is_copyright_line('# SPDX-License-Identifier: Apache-2.0') + # --------------------------------------------------------------------------- # _license_line_matches — wildcard_copyright_org @@ -228,6 +237,34 @@ def test_no_header_inserts_sentinel(self, tmp_path): assert ret == 1 assert COPYRIGHT_ORG_SENTINEL in src.read_text() + def test_reuse_style_replaced_org_not_duplicated(self, tmp_path): + """After replacing the sentinel in a REUSE-style header, re-running should not insert a duplicate.""" + reuse_license_text = ( + f'SPDX-FileCopyrightText: 2026 {COPYRIGHT_ORG_SENTINEL}\nSPDX-License-Identifier: Apache-2.0\n' + ) + lf = tmp_path / 'license.txt' + lf.write_text(reuse_license_text, encoding='utf-8') + + # File already has the sentinel replaced with a real org + src = self._write( + tmp_path, + 'f.py', + '# SPDX-FileCopyrightText: 2026 My Org\n# SPDX-License-Identifier: Apache-2.0\nimport foo\n', + ) + original = src.read_text() + ret = main([ + '--license-filepath', + str(lf), + '--comment-style', + '#', + '--allow-past-years', + '--no-extra-eol', + '--wildcard-copyright-org', + str(src), + ]) + assert ret == 0 + assert src.read_text() == original + def test_without_wildcard_rejects_different_org(self, tmp_path): src = self._write(tmp_path, 'f.py', ''.join(_file_with_header('Contributor Corp.'))) lf = self._license_file(tmp_path, org='Polymath Robotics, Inc.') From feafa20be0c307cccb867209885ce4f83a34e9ce Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 28 Apr 2026 16:18:46 -0700 Subject: [PATCH 3/4] Don't strip org name from LICENSE file in wildcard mode Signed-off-by: Emerson Knapp --- polymath_code_standard/checkers/copyright.py | 5 +++- tests/test_copyright.py | 24 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/polymath_code_standard/checkers/copyright.py b/polymath_code_standard/checkers/copyright.py index 6a67e39..732ae28 100644 --- a/polymath_code_standard/checkers/copyright.py +++ b/polymath_code_standard/checkers/copyright.py @@ -107,7 +107,10 @@ def run(self, args: argparse.Namespace) -> list[Result]: except OSError: pass - results.append(self._check_license_file(args.license_id, args.copyright_year, args.copyright_org or '')) + if args.wildcard_copyright_org: + results.append(Result(name='LICENSE file', passed=True, skipped=True)) + else: + results.append(self._check_license_file(args.license_id, args.copyright_year, args.copyright_org or '')) return results @staticmethod diff --git a/tests/test_copyright.py b/tests/test_copyright.py index 83db26e..480cd46 100644 --- a/tests/test_copyright.py +++ b/tests/test_copyright.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 """Tests for CopyrightGroup._check_license_file and _strip_leading_comment_block.""" +import argparse from unittest.mock import patch from polymath_code_standard.checkers.copyright import CopyrightGroup @@ -74,6 +75,29 @@ def test_fetch_error_returns_failed(self, tmp_path, monkeypatch): assert 'BOGUS' in result.output +class TestWildcardOrgSkipsLicenseFile: + def test_license_file_not_modified_with_wildcard_org(self, tmp_path, monkeypatch): + monkeypatch.chdir(tmp_path) + license_file = tmp_path / 'LICENSE' + original_content = 'Apache License 2.0\n\nCopyright Acme Corp\n' + license_file.write_text(original_content) + + args = argparse.Namespace( + license_id='Apache-2.0', + copyright_year='2026', + copyright_org=None, + wildcard_copyright_org=True, + reuse_style=True, + relicense=False, + files=[], + ) + with patch.object(CopyrightGroup, '_check_license_file') as mock_check: + CopyrightGroup().run(args) + mock_check.assert_not_called() + + assert license_file.read_text() == original_content + + _strip = CopyrightGroup._strip_leading_comment_block From 03195ffb31826db35eb0a4e88a9ae4bc03e5e8cf Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 28 Apr 2026 16:49:50 -0700 Subject: [PATCH 4/4] Don't use pre-commit action, because the cache for . is wrong Signed-off-by: Emerson Knapp --- .github/workflows/test.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e246b2..d5c1242 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,10 +12,12 @@ jobs: name: standardize thyself steps: - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: '3.10' - - uses: pre-commit/action@v3.0.1 + - run: python -m pip install pre-commit + shell: bash + - run: python -m pip freeze --local + shell: bash + - run: pre-commit run --show-diff-on-failure --color=always + shell: bash pytest: runs-on: ubuntu-latest