From 483355a38490efa207f9045d7bfae1bf97c2d015 Mon Sep 17 00:00:00 2001 From: Lasote Date: Mon, 5 Dec 2016 18:01:47 +0100 Subject: [PATCH 1/3] Changed version to 0.16.1 --- conans/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conans/__init__.py b/conans/__init__.py index f8e76ddf7a1..de58b9aedbe 100644 --- a/conans/__init__.py +++ b/conans/__init__.py @@ -9,5 +9,5 @@ from conans.util.files import load import os -__version__ = '0.16.0' +__version__ = '0.16.1' From f6c40e9cbf225aa26ace55ce63ab45c1604f7ffe Mon Sep 17 00:00:00 2001 From: "Javier G. Sogo" Date: Mon, 5 Dec 2016 17:08:46 +0100 Subject: [PATCH 2/3] fix bug: wrong order of arguments --- conans/client/command.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conans/client/command.py b/conans/client/command.py index 0f2c253f210..da2f08c7154 100644 --- a/conans/client/command.py +++ b/conans/client/command.py @@ -290,7 +290,8 @@ def test_package(self, *args): env = profile.env package_env = profile.package_env - loader = manager._loader(None, settings, options, scopes, package_settings, env, package_env) + loader = manager._loader(current_path=None, user_settings_values=settings, user_options_values=options, + scopes=scopes, package_settings=package_settings, env=env, package_env=package_env) conanfile = loader.load_conan(test_conanfile, self._user_io.out, consumer=True) try: # convert to list from ItemViews required for python3 From 9fd844e0bc06094a4ad663984bb4f8aaaf1de6d1 Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 5 Dec 2016 18:20:39 +0100 Subject: [PATCH 3/3] added test --- conans/test/integration/conan_test_test.py | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/conans/test/integration/conan_test_test.py b/conans/test/integration/conan_test_test.py index bffe9145c13..55a750021cc 100644 --- a/conans/test/integration/conan_test_test.py +++ b/conans/test/integration/conan_test_test.py @@ -11,6 +11,33 @@ @attr("slow") class ConanTestTest(unittest.TestCase): + def scopes_test_package_test(self): + client = TestClient() + conanfile = """ +from conans import ConanFile + +class HelloConan(ConanFile): + name = "Hello" + version = "0.1" + + def build(self): + self.output.info("Scope: %s" % self.scope) +""" + test_conanfile = """ +from conans import ConanFile, CMake +import os + +class HelloReuseConan(ConanFile): + requires = "Hello/0.1@lasote/stable" + + def test(self): + self.conanfile_directory +""" + client.save({"conanfile.py": conanfile, + "test/conanfile.py": test_conanfile}) + client.run("test_package --scope Hello:dev=True --build=missing") + self.assertIn("Hello/0.1@lasote/stable: Scope: dev=True", client.user_io.out) + def fail_test_package_test(self): client = TestClient() conanfile = """