From 2639641929844fd01894b32f8a6ede544fda3aaa Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Tue, 9 Oct 2018 16:43:17 -0300 Subject: [PATCH 1/6] #3671 Add tags attribute - Support new attribute on Conafile: tags Signed-off-by: Uilian Ries --- conans/client/cmd/new.py | 8 ++++++++ conans/client/conan_api.py | 4 ++-- conans/client/graph/grapher.py | 3 ++- conans/client/printer.py | 6 ++++++ conans/model/conan_file.py | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/conans/client/cmd/new.py b/conans/client/cmd/new.py index 29e643a281f..3e843af250b 100644 --- a/conans/client/cmd/new.py +++ b/conans/client/cmd/new.py @@ -11,8 +11,10 @@ class {package_name}Conan(ConanFile): name = "{name}" version = "{version}" license = "" + author = " " url = "" description = "" + tags = ["", "", ""] settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -62,6 +64,8 @@ class {package_name}Conan(ConanFile): description = "" url = "None" license = "None" + author = "None" + tags = None def package(self): self.copy("*") @@ -77,8 +81,10 @@ class {package_name}Conan(ConanFile): name = "{name}" version = "{version}" license = "" + author = " " url = "" description = "" + tags = ["", "", ""] settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -116,8 +122,10 @@ class {package_name}Conan(ConanFile): name = "{name}" version = "{version}" license = "" + author = " " url = "" description = "" + tags = ["", "", ""] no_copy_source = True # No settings/options are necessary, this is header only diff --git a/conans/client/conan_api.py b/conans/client/conan_api.py index aadb27449dd..7aa2e8fd350 100644 --- a/conans/client/conan_api.py +++ b/conans/client/conan_api.py @@ -295,8 +295,8 @@ def inspect(self, path, attributes, remote_name=None): result = OrderedDict() if not attributes: attributes = ['name', 'version', 'url', 'license', 'author', 'description', - 'generators', 'exports', 'exports_sources', 'short_paths', - 'apply_env', 'build_policy'] + 'tags', 'generators', 'exports', 'exports_sources', 'short_paths', + 'apply_env', 'build_policy'] for attribute in attributes: try: attr = getattr(conanfile, attribute) diff --git a/conans/client/graph/grapher.py b/conans/client/graph/grapher.py index 157e76bb5b0..966d045a0d2 100644 --- a/conans/client/graph/grapher.py +++ b/conans/client/graph/grapher.py @@ -144,7 +144,8 @@ def graph(self): ("build_id", build_id(conanfile)), ("url", '{url}'.format(url=conanfile.url)), ("license", conanfile.license), - ("author", conanfile.author)]: + ("author", conanfile.author), + ("tags", conanfile.tags)]: if data: data = data.replace("'", '"') fulllabel.append("
  • %s: %s
    • " % (name, data)) diff --git a/conans/client/printer.py b/conans/client/printer.py index 3aaf3931ccb..a4f7e21d553 100644 --- a/conans/client/printer.py +++ b/conans/client/printer.py @@ -113,6 +113,7 @@ def show(field): url = getattr(conan, "url", None) license_ = getattr(conan, "license", None) author = getattr(conan, "author", None) + tags = getattr(conan, "tags", None) if url and show("url"): self._out.writeln(" URL: %s" % url, Color.BRIGHT_GREEN) @@ -123,6 +124,11 @@ def show(field): self._out.writeln(" License: %s" % license_, Color.BRIGHT_GREEN) if author and show("author"): self._out.writeln(" Author: %s" % author, Color.BRIGHT_GREEN) + if tags and show("tags"): + if isinstance(tags, (list, tuple, set)): + self._out.writeln(" Tags: %s" % ", ".join(tags), Color.BRIGHT_GREEN) + else: + self._out.writeln(" Tags: %s" % tags, Color.BRIGHT_GREEN) if isinstance(ref, ConanFileReference) and show("recipe"): # Excludes PROJECT self._out.writeln(" Recipe: %s" % node.recipe) diff --git a/conans/model/conan_file.py b/conans/model/conan_file.py index 3625a3695bf..50fb5861462 100644 --- a/conans/model/conan_file.py +++ b/conans/model/conan_file.py @@ -90,6 +90,7 @@ class ConanFile(object): license = None author = None # Main maintainer/responsible for the package, any format description = None + tags = None build_policy = None short_paths = False apply_env = True # Apply environment variables from requires deps_env_info and profiles From 63723d340c9936bad74160cc59a4bf6e485d9326 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Tue, 9 Oct 2018 17:51:28 -0300 Subject: [PATCH 2/6] #3671 Testing new attribute: tags - Validate both inspect and info commands using tags as attribute Signed-off-by: Uilian Ries --- conans/test/command/info_test.py | 52 +++++++++++++++++++++++++++++ conans/test/command/inspect_test.py | 35 ++++++++++++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/conans/test/command/info_test.py b/conans/test/command/info_test.py index c3aea03d757..ea78467e645 100644 --- a/conans/test/command/info_test.py +++ b/conans/test/command/info_test.py @@ -473,3 +473,55 @@ def wrong_path_parameter_test(self): self.client.run("info conanfile.txt", ignore_error=True) self.assertIn("ERROR: Conanfile not found", self.client.out) + + def test_common_attributes(self): + self.client = TestClient() + + conanfile = """from conans import ConanFile +from conans.util.files import load, save + +class MyTest(ConanFile): + name = "Pkg" + version = "0.1" + settings = "build_type" + +""" + + self.client.save({"subfolder/conanfile.py": conanfile}) + self.client.run("export ./subfolder lasote/testing") + + self.client.run("info ./subfolder") + + self.assertIn("Pkg/0.1@PROJECT", self.client.user_io.out) + self.assertNotIn("License: MIT", self.client.user_io.out) + self.assertNotIn("Author: John Doe", self.client.user_io.out) + self.assertNotIn("Tags: foo, bar, qux", self.client.user_io.out) + self.assertNotIn("URL: https://foo.bar.baz", self.client.user_io.out) + + def test_full_attributes(self): + self.client = TestClient() + + conanfile = """from conans import ConanFile +from conans.util.files import load, save + +class MyTest(ConanFile): + name = "Pkg" + version = "0.2" + settings = "build_type" + author = "John Doe" + license = "MIT" + url = "https://foo.bar.baz" + tags = ["foo", "bar", "qux"] + +""" + + self.client.save({"subfolder/conanfile.py": conanfile}) + self.client.run("export ./subfolder lasote/testing") + + self.client.run("info ./subfolder") + + self.assertIn("Pkg/0.2@PROJECT", self.client.user_io.out) + self.assertIn("License: MIT", self.client.user_io.out) + self.assertIn("Author: John Doe", self.client.user_io.out) + self.assertIn("Tags: foo, bar, qux", self.client.user_io.out) + self.assertIn("URL: https://foo.bar.baz", self.client.user_io.out) diff --git a/conans/test/command/inspect_test.py b/conans/test/command/inspect_test.py index 1b3f529fbb4..68474ad9b56 100644 --- a/conans/test/command/inspect_test.py +++ b/conans/test/command/inspect_test.py @@ -142,4 +142,37 @@ def build(self): exports_sources: None short_paths: False apply_env: True -build_policy: None""", client.out) +build_policy: None +tags: None""", client.out) + + def test_inspect_filled_attributes(self): + client = TestClient() + conanfile = """from conans import ConanFile +class Pkg(ConanFile): + name = "MyPkg" + version = "1.2.3" + author = "John Doe" + url = "https://john.doe.com" + license = "MIT" + description = "Yet Another Test" + generators = "cmake" + tags = ["foo", "bar", "qux"] + _private = "Nothing" + def build(self): + pass +""" + client.save({"conanfile.py": conanfile}) + client.run("inspect .") + self.assertIn("""name: MyPkg +version: 1.2.3 +url: https://john.doe.com +license: MIT +author: John Doe +description: Yet Another Test +generators: cmake +exports: None +exports_sources: None +short_paths: False +apply_env: True +build_policy: None +tags: ['foo', 'bar', 'qux']""", client.out) From c78dfd3117feb2de262cb8fc79473b81afd713b1 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Tue, 9 Oct 2018 18:29:27 -0300 Subject: [PATCH 3/6] #3671 Fixing inspect test - Fix attribute order to validate inspect command Signed-off-by: Uilian Ries --- conans/test/command/inspect_test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conans/test/command/inspect_test.py b/conans/test/command/inspect_test.py index 68474ad9b56..f9fc0344fd9 100644 --- a/conans/test/command/inspect_test.py +++ b/conans/test/command/inspect_test.py @@ -137,13 +137,14 @@ def build(self): license: None author: None description: None +tags: None generators: ['txt'] exports: None exports_sources: None short_paths: False apply_env: True build_policy: None -tags: None""", client.out) +""", client.out) def test_inspect_filled_attributes(self): client = TestClient() @@ -169,10 +170,10 @@ def build(self): license: MIT author: John Doe description: Yet Another Test +tags: ['foo', 'bar', 'qux'] generators: cmake exports: None exports_sources: None short_paths: False apply_env: True -build_policy: None -tags: ['foo', 'bar', 'qux']""", client.out) +build_policy: None""", client.out) From 3d7d3247fd9f20452b6ed5b90495129db287d92b Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Mon, 22 Oct 2018 10:39:01 -0300 Subject: [PATCH 4/6] #3671 Rename tags to topics - We believe that topics is a better name, because tags remember svn and git features. - We voted also for labels but topics sounds better. - Thanks to @SSE4 for 'topics' Signed-off-by: Uilian Ries --- conans/client/cmd/new.py | 8 ++++---- conans/client/conan_api.py | 2 +- conans/client/graph/grapher.py | 2 +- conans/client/printer.py | 10 +++++----- conans/model/conan_file.py | 2 +- conans/test/command/info_test.py | 2 +- conans/test/command/inspect_test.py | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conans/client/cmd/new.py b/conans/client/cmd/new.py index 3e843af250b..57ad0a75688 100644 --- a/conans/client/cmd/new.py +++ b/conans/client/cmd/new.py @@ -14,7 +14,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - tags = ["", "", ""] + topics = ["", "", ""] settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -65,7 +65,7 @@ class {package_name}Conan(ConanFile): url = "None" license = "None" author = "None" - tags = None + topics = None def package(self): self.copy("*") @@ -84,7 +84,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - tags = ["", "", ""] + topics = ["", "", ""] settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -125,7 +125,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - tags = ["", "", ""] + topics = ["", "", ""] no_copy_source = True # No settings/options are necessary, this is header only diff --git a/conans/client/conan_api.py b/conans/client/conan_api.py index 7aa2e8fd350..fad6f7bae55 100644 --- a/conans/client/conan_api.py +++ b/conans/client/conan_api.py @@ -295,7 +295,7 @@ def inspect(self, path, attributes, remote_name=None): result = OrderedDict() if not attributes: attributes = ['name', 'version', 'url', 'license', 'author', 'description', - 'tags', 'generators', 'exports', 'exports_sources', 'short_paths', + 'topics', 'generators', 'exports', 'exports_sources', 'short_paths', 'apply_env', 'build_policy'] for attribute in attributes: try: diff --git a/conans/client/graph/grapher.py b/conans/client/graph/grapher.py index 966d045a0d2..07520ac8b9c 100644 --- a/conans/client/graph/grapher.py +++ b/conans/client/graph/grapher.py @@ -145,7 +145,7 @@ def graph(self): ("url", '{url}'.format(url=conanfile.url)), ("license", conanfile.license), ("author", conanfile.author), - ("tags", conanfile.tags)]: + ("topics", conanfile.topics)]: if data: data = data.replace("'", '"') fulllabel.append("
  • %s: %s
    • " % (name, data)) diff --git a/conans/client/printer.py b/conans/client/printer.py index a4f7e21d553..100b9a17982 100644 --- a/conans/client/printer.py +++ b/conans/client/printer.py @@ -113,7 +113,7 @@ def show(field): url = getattr(conan, "url", None) license_ = getattr(conan, "license", None) author = getattr(conan, "author", None) - tags = getattr(conan, "tags", None) + topics = getattr(conan, "topics", None) if url and show("url"): self._out.writeln(" URL: %s" % url, Color.BRIGHT_GREEN) @@ -124,11 +124,11 @@ def show(field): self._out.writeln(" License: %s" % license_, Color.BRIGHT_GREEN) if author and show("author"): self._out.writeln(" Author: %s" % author, Color.BRIGHT_GREEN) - if tags and show("tags"): - if isinstance(tags, (list, tuple, set)): - self._out.writeln(" Tags: %s" % ", ".join(tags), Color.BRIGHT_GREEN) + if topics and show("topics"): + if isinstance(topics, (list, tuple, set)): + self._out.writeln(" Topics: %s" % ", ".join(topics), Color.BRIGHT_GREEN) else: - self._out.writeln(" Tags: %s" % tags, Color.BRIGHT_GREEN) + self._out.writeln(" Topics: %s" % topics, Color.BRIGHT_GREEN) if isinstance(ref, ConanFileReference) and show("recipe"): # Excludes PROJECT self._out.writeln(" Recipe: %s" % node.recipe) diff --git a/conans/model/conan_file.py b/conans/model/conan_file.py index 50fb5861462..477f9b8d694 100644 --- a/conans/model/conan_file.py +++ b/conans/model/conan_file.py @@ -90,7 +90,7 @@ class ConanFile(object): license = None author = None # Main maintainer/responsible for the package, any format description = None - tags = None + topics = None build_policy = None short_paths = False apply_env = True # Apply environment variables from requires deps_env_info and profiles diff --git a/conans/test/command/info_test.py b/conans/test/command/info_test.py index ea78467e645..2f2f8c53064 100644 --- a/conans/test/command/info_test.py +++ b/conans/test/command/info_test.py @@ -511,7 +511,7 @@ class MyTest(ConanFile): author = "John Doe" license = "MIT" url = "https://foo.bar.baz" - tags = ["foo", "bar", "qux"] + topics = ["foo", "bar", "qux"] """ diff --git a/conans/test/command/inspect_test.py b/conans/test/command/inspect_test.py index f9fc0344fd9..e86bb084321 100644 --- a/conans/test/command/inspect_test.py +++ b/conans/test/command/inspect_test.py @@ -137,7 +137,7 @@ def build(self): license: None author: None description: None -tags: None +topics: None generators: ['txt'] exports: None exports_sources: None @@ -157,7 +157,7 @@ class Pkg(ConanFile): license = "MIT" description = "Yet Another Test" generators = "cmake" - tags = ["foo", "bar", "qux"] + topics = ["foo", "bar", "qux"] _private = "Nothing" def build(self): pass @@ -170,7 +170,7 @@ def build(self): license: MIT author: John Doe description: Yet Another Test -tags: ['foo', 'bar', 'qux'] +topics: ['foo', 'bar', 'qux'] generators: cmake exports: None exports_sources: None From 7a90b4ffe497f70a168cd069b6d278ea6609f4f4 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Mon, 22 Oct 2018 11:16:57 -0300 Subject: [PATCH 5/6] #3671 Add homepage attribute - Homepage is optional but will be listed by info and inspect commands - Update unit tests to validate homepage - Update topics to be used as tuple Signed-off-by: Uilian Ries --- conans/client/cmd/new.py | 6 +++--- conans/client/conan_api.py | 6 +++--- conans/client/graph/grapher.py | 1 + conans/client/printer.py | 3 +++ conans/model/conan_file.py | 1 + conans/test/command/info_test.py | 7 +++++-- conans/test/command/inspect_test.py | 3 +++ conans/test/command/new_test.py | 6 ++++++ 8 files changed, 25 insertions(+), 8 deletions(-) diff --git a/conans/client/cmd/new.py b/conans/client/cmd/new.py index 57ad0a75688..17e7e47663f 100644 --- a/conans/client/cmd/new.py +++ b/conans/client/cmd/new.py @@ -14,7 +14,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - topics = ["", "", ""] + topics = ("", "", "") settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -84,7 +84,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - topics = ["", "", ""] + topics = ("", "", "") settings = "os", "compiler", "build_type", "arch" options = {{"shared": [True, False]}} default_options = "shared=False" @@ -125,7 +125,7 @@ class {package_name}Conan(ConanFile): author = " " url = "" description = "" - topics = ["", "", ""] + topics = ("", "", "") no_copy_source = True # No settings/options are necessary, this is header only diff --git a/conans/client/conan_api.py b/conans/client/conan_api.py index fad6f7bae55..db42879eab9 100644 --- a/conans/client/conan_api.py +++ b/conans/client/conan_api.py @@ -294,9 +294,9 @@ def inspect(self, path, attributes, remote_name=None): result = OrderedDict() if not attributes: - attributes = ['name', 'version', 'url', 'license', 'author', 'description', - 'topics', 'generators', 'exports', 'exports_sources', 'short_paths', - 'apply_env', 'build_policy'] + attributes = ['name', 'version', 'url', 'homepage', 'license', 'author', + 'description', 'topics', 'generators', 'exports', 'exports_sources', + 'short_paths', 'apply_env', 'build_policy'] for attribute in attributes: try: attr = getattr(conanfile, attribute) diff --git a/conans/client/graph/grapher.py b/conans/client/graph/grapher.py index 07520ac8b9c..de0fb876cb6 100644 --- a/conans/client/graph/grapher.py +++ b/conans/client/graph/grapher.py @@ -143,6 +143,7 @@ def graph(self): for name, data in [("id", conanfile.info.package_id()), ("build_id", build_id(conanfile)), ("url", '{url}'.format(url=conanfile.url)), + ("homepage", '{url}'.format(url=conanfile.homepage)), ("license", conanfile.license), ("author", conanfile.author), ("topics", conanfile.topics)]: diff --git a/conans/client/printer.py b/conans/client/printer.py index 100b9a17982..f8f95b46dec 100644 --- a/conans/client/printer.py +++ b/conans/client/printer.py @@ -111,11 +111,14 @@ def show(field): else: self._out.writeln(" Remote: None", Color.BRIGHT_GREEN) url = getattr(conan, "url", None) + homepage = getattr(conan, "homepage", None) license_ = getattr(conan, "license", None) author = getattr(conan, "author", None) topics = getattr(conan, "topics", None) if url and show("url"): self._out.writeln(" URL: %s" % url, Color.BRIGHT_GREEN) + if homepage and show("homepage"): + self._out.writeln(" Homepage: %s" % homepage, Color.BRIGHT_GREEN) if license_ and show("license"): if isinstance(license_, (list, tuple, set)): diff --git a/conans/model/conan_file.py b/conans/model/conan_file.py index 477f9b8d694..105121216db 100644 --- a/conans/model/conan_file.py +++ b/conans/model/conan_file.py @@ -91,6 +91,7 @@ class ConanFile(object): author = None # Main maintainer/responsible for the package, any format description = None topics = None + homepage = None build_policy = None short_paths = False apply_env = True # Apply environment variables from requires deps_env_info and profiles diff --git a/conans/test/command/info_test.py b/conans/test/command/info_test.py index 2f2f8c53064..b8ad62976e3 100644 --- a/conans/test/command/info_test.py +++ b/conans/test/command/info_test.py @@ -495,7 +495,8 @@ class MyTest(ConanFile): self.assertIn("Pkg/0.1@PROJECT", self.client.user_io.out) self.assertNotIn("License: MIT", self.client.user_io.out) self.assertNotIn("Author: John Doe", self.client.user_io.out) - self.assertNotIn("Tags: foo, bar, qux", self.client.user_io.out) + self.assertNotIn("Topics:", self.client.user_io.out) + self.assertNotIn("Homepage:", self.client.user_io.out) self.assertNotIn("URL: https://foo.bar.baz", self.client.user_io.out) def test_full_attributes(self): @@ -511,6 +512,7 @@ class MyTest(ConanFile): author = "John Doe" license = "MIT" url = "https://foo.bar.baz" + homepage = "https://foo.bar.site" topics = ["foo", "bar", "qux"] """ @@ -523,5 +525,6 @@ class MyTest(ConanFile): self.assertIn("Pkg/0.2@PROJECT", self.client.user_io.out) self.assertIn("License: MIT", self.client.user_io.out) self.assertIn("Author: John Doe", self.client.user_io.out) - self.assertIn("Tags: foo, bar, qux", self.client.user_io.out) + self.assertIn("Topics: foo, bar, qux", self.client.user_io.out) self.assertIn("URL: https://foo.bar.baz", self.client.user_io.out) + self.assertIn("Homepage: https://foo.bar.site", self.client.user_io.out) diff --git a/conans/test/command/inspect_test.py b/conans/test/command/inspect_test.py index e86bb084321..0119dc7a223 100644 --- a/conans/test/command/inspect_test.py +++ b/conans/test/command/inspect_test.py @@ -134,6 +134,7 @@ def build(self): self.assertIn("""name: MyPkg version: 1.2.3 url: None +homepage: None license: None author: None description: None @@ -154,6 +155,7 @@ class Pkg(ConanFile): version = "1.2.3" author = "John Doe" url = "https://john.doe.com" + homepage = "https://john.company.site" license = "MIT" description = "Yet Another Test" generators = "cmake" @@ -167,6 +169,7 @@ def build(self): self.assertIn("""name: MyPkg version: 1.2.3 url: https://john.doe.com +homepage: https://john.company.site license: MIT author: John Doe description: Yet Another Test diff --git a/conans/test/command/new_test.py b/conans/test/command/new_test.py index d79601d1988..c6b035077b5 100644 --- a/conans/test/command/new_test.py +++ b/conans/test/command/new_test.py @@ -61,6 +61,8 @@ def new_header_test(self): content = load(os.path.join(root, "conanfile.py")) self.assertIn('name = "MyPackage"', content) self.assertIn('version = "1.3"', content) + self.assertIn('topics = (', content) + self.assertNotIn('homepage', content) self.assertTrue(os.path.exists(os.path.join(root, "test_package/conanfile.py"))) self.assertTrue(os.path.exists(os.path.join(root, "test_package/CMakeLists.txt"))) self.assertTrue(os.path.exists(os.path.join(root, "test_package/example.cpp"))) @@ -78,6 +80,8 @@ def new_sources_test(self): self.assertIn('name = "MyPackage"', content) self.assertIn('version = "1.3"', content) self.assertIn('exports_sources', content) + self.assertIn('topics = (', content) + self.assertNotIn('homepage', content) self.assertNotIn('source()', content) # assert they are correct at least client.run("export . myuser/testing") @@ -93,6 +97,8 @@ def new_purec_test(self): self.assertIn('name = "MyPackage"', content) self.assertIn('version = "1.3"', content) self.assertIn('del self.settings.compiler.libcxx', content) + self.assertIn('topics = (', content) + self.assertNotIn('homepage', content) # assert they are correct at least client.run("export . myuser/testing") client.run("search") From fc0de2fdf37d9208c3751ad1b713e02e39121123 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 24 Oct 2018 13:18:44 -0300 Subject: [PATCH 6/6] #3671 Update attribute test Signed-off-by: Uilian Ries --- conans/test/command/info_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conans/test/command/info_test.py b/conans/test/command/info_test.py index b8ad62976e3..ea024fa4628 100644 --- a/conans/test/command/info_test.py +++ b/conans/test/command/info_test.py @@ -493,11 +493,11 @@ class MyTest(ConanFile): self.client.run("info ./subfolder") self.assertIn("Pkg/0.1@PROJECT", self.client.user_io.out) - self.assertNotIn("License: MIT", self.client.user_io.out) - self.assertNotIn("Author: John Doe", self.client.user_io.out) + self.assertNotIn("License:", self.client.user_io.out) + self.assertNotIn("Author:", self.client.user_io.out) self.assertNotIn("Topics:", self.client.user_io.out) self.assertNotIn("Homepage:", self.client.user_io.out) - self.assertNotIn("URL: https://foo.bar.baz", self.client.user_io.out) + self.assertNotIn("URL:", self.client.user_io.out) def test_full_attributes(self): self.client = TestClient()