Merge branch 'release/0.18.5'

conan-io · Aug 28, 2018 · 347ccc6 · 347ccc6
2 parents f8f6327 + df0618b
commit 347ccc6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git 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
@@ -23,6 +23,17 @@
 from cpt.uploader import Uploader
 
 
+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
+        from conans.client.graph.python_requires import ConanPythonRequire
+        loader = ConanFileLoader(None, None, ConanPythonRequire(None, None))
+        return loader.load_class(path)
+
+
 class PlatformInfo(object):
     """Easy mockable for testing"""
     @staticmethod
@@ -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
@@ -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=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))