Merge branch 'release/0.19.4'

conan-io · Oct 9, 2018 · 195c2d1 · 195c2d1
2 parents 8dbd0d0 + 87e1b89
commit 195c2d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.19.3'
+__version__ = '0.19.4'
diff --git a/cpt/requirements.txt b/cpt/requirements.txt
@@ -1,5 +1,5 @@
 idna==2.6
 six>=1.10.0
 requests[security]
-conan>=1.7.0, <1.8.0
+conan>=1.7.0, <1.9.0
 tabulate==0.8.2
diff --git a/cpt/uploader.py b/cpt/uploader.py
@@ -38,10 +38,10 @@ def upload_packages(self, reference, upload, package_id):
                                       remote_name=remote_name,
                                       force=True,
                                       retry=int(self._upload_retry))
-            # Comming 1.8:
-            #else:
-            #    self.conan_api.upload(str(reference),
-            #                          all_packages=True,
-            #                          remote_name=remote_name,
-            #                          policy=UPLOAD_POLICY_FORCE,
-            #                          retry=int(self._upload_retry))
+            elif Version(client_version) < Version("1.9.0"):
+                from conans.client.cmd.uploader import UPLOAD_POLICY_FORCE
+                self.conan_api.upload(str(reference),
+                                      all_packages=True,
+                                      remote_name=remote_name,
+                                      policy=UPLOAD_POLICY_FORCE,
+                                      retry=int(self._upload_retry))