Skip to content

Commit

Permalink
Merge pull request #507 from conan-io/remove_public_domain_restriction
Browse files Browse the repository at this point in the history
removed public domain restriction
  • Loading branch information
uilianries authored Jul 10, 2023
2 parents 67892b3 + 6672815 commit ad69859
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
5 changes: 0 additions & 5 deletions hooks/conan-center.py
Original file line number Diff line number Diff line change
Expand Up @@ -951,11 +951,6 @@ def test(out):
if default_options and isinstance(default_options, dict) and default_options.get("shared") is True:
out.error("The option 'shared' must be 'False' by default. Update 'default_options'.")

@run_test("KB-H056", output)
def test(out):
if str(conanfile.license).lower() in ["public domain", "public-domain", "public_domain"]:
out.error("Public Domain is not a SPDX license. Use 'Unlicense' instead.")


@raise_if_error_output
def pre_source(output, conanfile, conanfile_path, **kwargs):
Expand Down
12 changes: 0 additions & 12 deletions tests/test_hooks/conan-center/test_conan-center.py
Original file line number Diff line number Diff line change
Expand Up @@ -991,18 +991,6 @@ def {0}requirements(self):
output = self.conan(['export', '.', 'name/version@user/test'])
self.assertIn("[SINGLE REQUIRES (KB-H055)] OK", output)

def test_public_domain_license(self):
conanfile = textwrap.dedent("""\
from conans import ConanFile
class AConan(ConanFile):
license = "Public Domain"
""")

tools.save('conanfile.py', content=conanfile)
output = self.conan(['export', '.', 'name/version@user/test'])
self.assertIn("ERROR: [LICENSE PUBLIC DOMAIN (KB-H056)] " \
"Public Domain is not a SPDX license. Use 'Unlicense' instead.", output)

def test_os_rename_warning(self):
conanfile = textwrap.dedent("""\
from conans import ConanFile, tools
Expand Down

0 comments on commit ad69859

Please sign in to comment.