Merged develop

conan-io · Jun 17, 2022 · 854f082 · 854f082
2 parents fa83005 + 22d083d
commit 854f082
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/conans/model/info.py b/conans/model/info.py
@@ -416,7 +416,7 @@ def package_id(self):
         package_id = sha1(text.encode())
         return package_id
 
-    def header_only(self):
+    def clear(self):
         self.settings.clear()
         self.options.clear()
         self.requires.clear()

diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_link_order.py b/conans/test/functional/toolchains/cmake/cmakedeps/test_link_order.py
@@ -89,7 +89,7 @@ class HeaderOnly(ConanFile):
         {% endif %}
 
         def package_id(self):
-            self.info.header_only()
+            self.info.clear()
 
         def package_info(self):
             self.cpp_info.includedirs = []

diff --git a/conans/test/integration/conanfile/test_attributes_scope.py b/conans/test/integration/conanfile/test_attributes_scope.py
@@ -59,7 +59,7 @@ def test_info_not_in_package(self):
             class Recipe(ConanFile):
 
                 def package(self):
-                    self.info.header_only()
+                    self.info.clear()
         """)
         t.save({'conanfile.py': conanfile})
         t.run('create . --name=name --version=version -s os=Linux', assert_error=True)

diff --git a/conans/test/integration/graph/core/test_provides.py b/conans/test/integration/graph/core/test_provides.py
@@ -248,7 +248,7 @@ def configure(self):
                     self.provides = 'libjpeg'
 
             def package_info(self):
-                self.info.header_only()
+                self.info.clear()
     """)
     t = TestClient()
     t.save({'requires.py': GenConanfile("req", "v1").with_provides("libjpeg"),

diff --git a/conans/test/integration/package_id/test_cache_compatibles.py b/conans/test/integration/package_id/test_cache_compatibles.py
@@ -283,7 +283,7 @@ class SumConan(ConanFile):
                 def build(self):
                     self.output.warning("My compiler is '{}'".format(self.settings.compiler))
                 def package_id(self):
-                    self.info.header_only()
+                    self.info.clear()
         """)
 
         client = TestClient()

diff --git a/conans/test/integration/package_id/transitive_header_only_test.py b/conans/test/integration/package_id/transitive_header_only_test.py
@@ -116,7 +116,7 @@ def test_transitive_second_level_header_only(self):
         client.run("create . --name=libb --version=1.0")
         # libC -> libB
 
-        unrelated = "self.info.header_only()"
+        unrelated = "self.info.clear()"
         client.save({"conanfile.py": GenConanfile().with_require("libb/1.0")
                                                    .with_package_id(unrelated)})
         client.run("create . --name=libc --version=1.0")
@@ -145,7 +145,7 @@ def test_transitive_header_only(self):
         client.run("create . --name=liba --version=1.0")
         client.run("create . --name=liba --version=2.0")
         client.save({"conanfile.py": GenConanfile().with_require("liba/1.0")
-                                                   .with_package_id("self.info.header_only()")})
+                                                   .with_package_id("self.info.clear()")})
         client.run("create . --name=libb --version=1.0")
         client.save({"conanfile.py": GenConanfile().with_require("libb/1.0")})
         client.run("create . --name=libc --version=1.0")

diff --git a/conans/test/unittests/model/info_test.py b/conans/test/unittests/model/info_test.py
@@ -76,7 +76,7 @@ def test_modes(self):
     shared=False
 '''
         info = ConanInfo.loads(info_text)
-        info.header_only()
+        info.clear()
         self.assertEqual(info.settings.dumps(), "")
         self.assertEqual(info.options.dumps(), "")
         self.assertEqual(info.requires.dumps(), "")