From 13b8561308238a2896e4a9823aca7270c140deac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 22:39:33 +0000 Subject: [PATCH 1/7] Update spdx-tools requirement from <=0.7.1 to <=0.8.2 Updates the requirements on [spdx-tools](https://github.com/spdx/tools-python) to permit the latest version. - [Release notes](https://github.com/spdx/tools-python/releases) - [Changelog](https://github.com/spdx/tools-python/blob/main/CHANGELOG.md) - [Commits](https://github.com/spdx/tools-python/compare/v0.3...v0.8.2) --- updated-dependencies: - dependency-name: spdx-tools dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ce20355..a912cab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "gitpython", "rospkg", "scancode-toolkit>=32.0.8", - "spdx-tools<=0.7.1" + "spdx-tools<=0.8.2" ] requires-python = ">=3.7" From f10f8215920ad81577f4be274a36abb6b2df53a1 Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 13:11:55 +0200 Subject: [PATCH 2/7] updated to latest versions of spdx tools and scancode-toolkit. Removed functionality of translating name to tag, therefore adapted some tests. Signed-off-by: Anton Utz --- src/ros_license_toolkit/license_tag.py | 39 +++++-------------- .../test_pkg_spdx_name | 2 +- test/unittest/test_license_tag.py | 3 -- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/ros_license_toolkit/license_tag.py b/src/ros_license_toolkit/license_tag.py index cdfdb94..1eb0451 100644 --- a/src/ros_license_toolkit/license_tag.py +++ b/src/ros_license_toolkit/license_tag.py @@ -24,28 +24,12 @@ from glob import glob from typing import Any, Dict, List, Optional, Set -from spdx.config import LICENSE_MAP +from license_expression import get_spdx_licensing def is_license_name_in_spdx_list(license_name: str) -> bool: """Check if a license name is in the SPDX list of licenses.""" - return license_name in LICENSE_MAP or \ - license_name in LICENSE_MAP.values() - - -def to_spdx_license_tag(license_name: str) -> str: - """Convert a license name to a SPDX license tag - (assuming it is shorter than the name). - This is because the dict from spdx.config.LICENSE_MAP - contains both pairings (tag, name) and (name, tag). - """ - for tag, name in LICENSE_MAP.items(): - if license_name in [tag, name]: - if len(tag) < len(name): - return tag - # else - return name - raise ValueError("License name not in SPDX list.") + return license_name in get_spdx_licensing().known_symbols def _eval_glob(glob_str: str, pkg_path: str) -> Set[str]: @@ -74,17 +58,14 @@ def __init__(self, element: ET.Element, # be found out through declaration, this field contains the tag self.id_from_license_text: Optional[str] = None - try: - self.id = to_spdx_license_tag(raw_license_name) - except ValueError: - # If the license name is not in the SPDX list, - # we assume it is a custom license and use the name as-is. - # This will be detected in `LicenseTagIsInSpdxListCheck`. - self.id = raw_license_name - # If a file is linked to the tag, set its id for internal checks - if license_file_scan_results: - self.id_from_license_text = \ - get_id_from_license_text(license_file_scan_results) + # If the license name is not in the SPDX list, + # we assume it is a custom license and use the name as-is. + # This will be detected in `LicenseTagIsInSpdxListCheck`. + self.id = raw_license_name + # If a file is linked to the tag, set its id for internal checks + if license_file_scan_results: + self.id_from_license_text = \ + get_id_from_license_text(license_file_scan_results) # Path to the file containing the license text # (relative to package root) diff --git a/test/_test_data/copyright_file_contents/test_pkg_spdx_name b/test/_test_data/copyright_file_contents/test_pkg_spdx_name index 72a9357..aaaede6 100644 --- a/test/_test_data/copyright_file_contents/test_pkg_spdx_name +++ b/test/_test_data/copyright_file_contents/test_pkg_spdx_name @@ -5,7 +5,7 @@ Upstream-Name: test_pkg_spdx_name Files: ** Copyright: 2003 Lawrence E. Rosen -License: AFL-2.0 +License: Academic Free License v2.0 The Academic Free License v. 2.0 diff --git a/test/unittest/test_license_tag.py b/test/unittest/test_license_tag.py index a8482ad..dc0e175 100644 --- a/test/unittest/test_license_tag.py +++ b/test/unittest/test_license_tag.py @@ -36,9 +36,6 @@ def test_init(self): by_spdx_tag = LicenseTag(ET.fromstring( "Apache-2.0"), "") self.assertEqual(by_spdx_tag.id, "Apache-2.0") - by_spdx_name = LicenseTag(ET.fromstring( - "Apache License 2.0"), "") - self.assertEqual(by_spdx_name.id, "Apache-2.0") if __name__ == '__main__': From 22c7208aa7bf147c0352a99b6a3418fd705dfa59 Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 13:26:22 +0200 Subject: [PATCH 3/7] increased version in pyproject Signed-off-by: Anton Utz --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a912cab..282df1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,8 +27,8 @@ keywords = ["ros", "license", "toolkit", "oss", "packages"] dependencies = [ "gitpython", "rospkg", - "scancode-toolkit>=32.0.8", - "spdx-tools<=0.8.2" + "scancode-toolkit>=32.1.0", + "spdx-tools>=0.8.2" ] requires-python = ">=3.7" From b4512634508ab11d3af501c36c4d2a1b75f4eacf Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 13:30:57 +0200 Subject: [PATCH 4/7] adapted scancode-toolkit version Signed-off-by: Anton Utz --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 282df1d..e771140 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ keywords = ["ros", "license", "toolkit", "oss", "packages"] dependencies = [ "gitpython", "rospkg", - "scancode-toolkit>=32.1.0", + "scancode-toolkit>=32.0.8", "spdx-tools>=0.8.2" ] requires-python = ">=3.7" From 43a8ebc70f6043c0bd065b709825f032670befbf Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 13:34:12 +0200 Subject: [PATCH 5/7] adapted spdx-tools version Signed-off-by: Anton Utz --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e771140..3001ecf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "gitpython", "rospkg", "scancode-toolkit>=32.0.8", - "spdx-tools>=0.8.2" + "spdx-tools>=0.7.0" ] requires-python = ">=3.7" From 93baf0221f54e086f0eeb6468e9303ef52fc7815 Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 13:37:42 +0200 Subject: [PATCH 6/7] adapted spdx-tools version Signed-off-by: Anton Utz --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3001ecf..57286e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "gitpython", "rospkg", "scancode-toolkit>=32.0.8", - "spdx-tools>=0.7.0" + "spdx-tools>=0.7.0rc0" ] requires-python = ">=3.7" From 088de690a17550c00d8e36a0ff3fbc9479e8ca62 Mon Sep 17 00:00:00 2001 From: Anton Utz Date: Thu, 4 Apr 2024 14:01:37 +0200 Subject: [PATCH 7/7] removed test case spdx_name Signed-off-by: Anton Utz --- .../test_pkg_spdx_name | 55 ------------------- test/_test_data/test_pkg_spdx_name/LICENSE | 46 ---------------- .../_test_data/test_pkg_spdx_name/package.xml | 7 --- test/systemtest/test_all_packages.py | 1 - test/systemtest/test_copyright.py | 1 - test/systemtest/test_separate_pkgs.py | 6 -- 6 files changed, 116 deletions(-) delete mode 100644 test/_test_data/copyright_file_contents/test_pkg_spdx_name delete mode 100644 test/_test_data/test_pkg_spdx_name/LICENSE delete mode 100644 test/_test_data/test_pkg_spdx_name/package.xml diff --git a/test/_test_data/copyright_file_contents/test_pkg_spdx_name b/test/_test_data/copyright_file_contents/test_pkg_spdx_name deleted file mode 100644 index aaaede6..0000000 --- a/test/_test_data/copyright_file_contents/test_pkg_spdx_name +++ /dev/null @@ -1,55 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: https://fake.git -Upstream-Name: test_pkg_spdx_name - -Files: - ** -Copyright: 2003 Lawrence E. Rosen -License: Academic Free License v2.0 - The Academic Free License - v. 2.0 - - This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: - Licensed under the Academic Free License version 2.0 - - 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: - a) to reproduce the Original Work in copies; - - b) to prepare derivative works ("Derivative Works") based upon the Original Work; - - c) to distribute copies of the Original Work and Derivative Works to the public; - - d) to perform the Original Work publicly; and - - e) to display the Original Work publicly. - - 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. - - 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. - - 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. - - 5) This section intentionally omitted. - - 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. - - 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. - - 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. - - 9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. - - 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, for patent infringement (i) against Licensor with respect to a patent applicable to software or (ii) against any entity with respect to a patent applicable to the Original Work (but excluding combinations of the Original Work with other software or hardware). - - 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. � 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. - - 12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. - - 13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. - - 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For 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. - - 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - - This license is Copyright (C) 2003 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. - diff --git a/test/_test_data/test_pkg_spdx_name/LICENSE b/test/_test_data/test_pkg_spdx_name/LICENSE deleted file mode 100644 index 008ba30..0000000 --- a/test/_test_data/test_pkg_spdx_name/LICENSE +++ /dev/null @@ -1,46 +0,0 @@ -The Academic Free License - v. 2.0 - -This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: -Licensed under the Academic Free License version 2.0 - -1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: -a) to reproduce the Original Work in copies; - -b) to prepare derivative works ("Derivative Works") based upon the Original Work; - -c) to distribute copies of the Original Work and Derivative Works to the public; - -d) to perform the Original Work publicly; and - -e) to display the Original Work publicly. - -2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. - -3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. - -4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. - -5) This section intentionally omitted. - -6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. - -7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. - -8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. - -9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. - -10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, for patent infringement (i) against Licensor with respect to a patent applicable to software or (ii) against any entity with respect to a patent applicable to the Original Work (but excluding combinations of the Original Work with other software or hardware). - -11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. � 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. - -12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. - -13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. - -14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For 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. - -15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - -This license is Copyright (C) 2003 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. \ No newline at end of file diff --git a/test/_test_data/test_pkg_spdx_name/package.xml b/test/_test_data/test_pkg_spdx_name/package.xml deleted file mode 100644 index 0dd3a8a..0000000 --- a/test/_test_data/test_pkg_spdx_name/package.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - test_pkg_spdx_name - Academic Free License v2.0 - - diff --git a/test/systemtest/test_all_packages.py b/test/systemtest/test_all_packages.py index 6b75762..6908b5a 100644 --- a/test/systemtest/test_all_packages.py +++ b/test/systemtest/test_all_packages.py @@ -56,7 +56,6 @@ def test_all(self): self.assertIn(b"test_pkg_no_license", stdout) self.assertIn(b"test_pkg_no_license_file", stdout) self.assertIn(b"test_pkg_one_correct_one_license_file_missing", stdout) - self.assertIn(b"test_pkg_spdx_name", stdout) self.assertIn(b"test_pkg_spdx_tag", stdout) self.assertIn(b"test_pkg_too_many_license_files", stdout) self.assertIn(b"test_pkg_tag_not_spdx", stdout) diff --git a/test/systemtest/test_copyright.py b/test/systemtest/test_copyright.py index 381220a..0ea622a 100644 --- a/test/systemtest/test_copyright.py +++ b/test/systemtest/test_copyright.py @@ -26,7 +26,6 @@ TEST_PACKAGES_COPYRIGHT_FILE = [ "test_pkg_has_code_disjoint", "test_pkg_has_code_of_different_license_and_tag", - "test_pkg_spdx_name", "test_pkg_spdx_tag", "test_pkg_with_license_and_file", "test_pkg_unknown_license" diff --git a/test/systemtest/test_separate_pkgs.py b/test/systemtest/test_separate_pkgs.py index 94382ee..360ebc9 100644 --- a/test/systemtest/test_separate_pkgs.py +++ b/test/systemtest/test_separate_pkgs.py @@ -137,12 +137,6 @@ def test_pkg_one_correct_one_license_file_missing(self): self.assertEqual(os.EX_DATAERR, main( ["test/_test_data/test_pkg_one_correct_one_license_file_missing"])) - def test_pkg_spdx_name(self): - """Test on a package with a license declared in the package.xml - with the SPDX name.""" - self.assertEqual(os.EX_OK, main( - ["test/_test_data/test_pkg_spdx_name"])) - def test_pkg_spdx_tag(self): """Test on a package with a license declared in the package.xml with the SPDX tag."""