Merge branch 'release/0.30.2'

conan-io · Nov 5, 2019 · 6a0c639 · 6a0c639
2 parents ed932d7 + 9833d98
commit 6a0c639
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cpt/packager.py b/cpt/packager.py
@@ -54,6 +54,7 @@ def load_cf_class(path, conan_api):
         else:
             return conan_api.app.loader.load_basic(path)
 
+
 class PlatformInfo(object):
     """Easy mockable for testing"""
     @staticmethod

diff --git a/cpt/uploader.py b/cpt/uploader.py
@@ -47,11 +47,9 @@ def _upload_artifacts(self, reference, upload, package_id=None):
                                       remote_name=remote_name,
                                       force=True,
                                       retry=int(self._upload_retry))
-            elif client_version <= Version("1.20.0"):
+            else:
                 all_packages = package_id != None
                 self.conan_api.upload(str(reference),
                                       all_packages=all_packages,
                                       remote_name=remote_name,
                                       retry=int(self._upload_retry))
-            else:
-                raise Exception("Incompatible installed Conan version found: %s" % client_version)