From 050800f23ba6292bbf5892588d6374ba79608498 Mon Sep 17 00:00:00 2001 From: Luis Martinez de Bartolome Date: Tue, 28 Aug 2018 16:44:15 +0200 Subject: [PATCH 1/3] Fixed for Conan 1.7.0 --- cpt/packager.py | 17 ++++++++++++++--- cpt/uploader.py | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cpt/packager.py b/cpt/packager.py index 3fcb2696..ab816252 100644 --- a/cpt/packager.py +++ b/cpt/packager.py @@ -6,7 +6,7 @@ import six -from conans.client.loader_parse import load_conanfile_class + from conans.model.version import Version from cpt.auth import AuthManager from cpt.ci_manager import CIManager @@ -21,6 +21,17 @@ from conans.model.ref import ConanFileReference from conans import __version__ as client_version, tools from cpt.uploader import Uploader +from conans.client.graph.python_requires import ConanPythonRequire + + +def load_cf_class(path): + if Version(client_version) < Version("1.7.0"): + from conans.client.loader_parse import load_conanfile_class + return load_conanfile_class(path) + else: + from conans.client.loader import ConanFileLoader + loader = ConanFileLoader(None, None, ConanPythonRequire(None, None)) + return loader.load_class(path) class PlatformInfo(object): @@ -150,7 +161,7 @@ def __init__(self, args=None, username=None, channel=None, runner=None, else: if not os.path.exists("conanfile.py"): raise Exception("Conanfile not found, specify a 'reference' parameter with name and version") - conanfile = load_conanfile_class("./conanfile.py") + conanfile = load_cf_class("./conanfile.py") name, version = conanfile.name, conanfile.version if name and version: self.reference = ConanFileReference(name, version, self.username, self.channel) @@ -339,7 +350,7 @@ def add_common_builds(self, shared_option_name=None, pure_c=True, if shared_option_name is None: if os.path.exists("conanfile.py"): - conanfile = load_conanfile_class("./conanfile.py") + conanfile = load_cf_class("./conanfile.py") if hasattr(conanfile, "options") and "shared" in conanfile.options: shared_option_name = "%s:shared" % self.reference.name diff --git a/cpt/uploader.py b/cpt/uploader.py index 211afe90..0758ba40 100644 --- a/cpt/uploader.py +++ b/cpt/uploader.py @@ -25,6 +25,6 @@ def upload_packages(self, reference, upload): self.auth_manager.login(remote_name) self.conan_api.upload(str(reference), all_packages=True, - remote=remote_name, + remote_name=remote_name, force=True, retry=int(self._upload_retry)) From 85daed08745f4934838702265aaec5548dfcd122 Mon Sep 17 00:00:00 2001 From: Luis Martinez de Bartolome Date: Tue, 28 Aug 2018 16:45:52 +0200 Subject: [PATCH 2/3] Moved import --- cpt/packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpt/packager.py b/cpt/packager.py index ab816252..d9efe295 100644 --- a/cpt/packager.py +++ b/cpt/packager.py @@ -21,7 +21,6 @@ from conans.model.ref import ConanFileReference from conans import __version__ as client_version, tools from cpt.uploader import Uploader -from conans.client.graph.python_requires import ConanPythonRequire def load_cf_class(path): @@ -30,6 +29,7 @@ def load_cf_class(path): return load_conanfile_class(path) else: from conans.client.loader import ConanFileLoader + from conans.client.graph.python_requires import ConanPythonRequire loader = ConanFileLoader(None, None, ConanPythonRequire(None, None)) return loader.load_class(path) From df0618b76beb8e34658835a4005864753f530dc1 Mon Sep 17 00:00:00 2001 From: Luis Martinez de Bartolome Date: Tue, 28 Aug 2018 17:06:34 +0200 Subject: [PATCH 3/3] different api parameter name --- cpt/uploader.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/cpt/uploader.py b/cpt/uploader.py index 0758ba40..a06a0fc8 100644 --- a/cpt/uploader.py +++ b/cpt/uploader.py @@ -21,10 +21,21 @@ def upload_packages(self, reference, upload): return if upload: + from conans.model.version import Version + from conans import __version__ as client_version self.printer.print_message("Uploading packages for '%s'" % str(reference)) self.auth_manager.login(remote_name) - self.conan_api.upload(str(reference), - all_packages=True, - remote_name=remote_name, - force=True, - retry=int(self._upload_retry)) + + + if Version(client_version) < Version("1.7.0"): + self.conan_api.upload(str(reference), + all_packages=True, + remote=remote_name, + force=True, + retry=int(self._upload_retry)) + else: + self.conan_api.upload(str(reference), + all_packages=True, + remote_name=remote_name, + force=True, + retry=int(self._upload_retry))