Merge branch 'release/0.28.1'

conan-io · Jun 7, 2019 · c7b7b81 · c7b7b81
2 parents ecba2e7 + c52b46d
commit c7b7b81
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,5 +1,5 @@
 
-__version__ = '0.28.0'
+__version__ = '0.28.1'
 NEWEST_CONAN_SUPPORTED = "1.17.0-dev"
 
 

diff --git a/cpt/packager.py b/cpt/packager.py
@@ -29,6 +29,13 @@ def load_cf_class(path, conan_api):
     if Version(client_version) < Version("1.7.0"):
         from conans.client.loader_parse import load_conanfile_class
         return load_conanfile_class(path)
+    elif Version(client_version) < Version("1.14.0"):
+        return conan_api._loader.load_class(path)
+    elif Version(client_version) < Version("1.15.0"):
+        remotes = conan_api._cache.registry.remotes.list
+        for remote in remotes:
+            conan_api.python_requires.enable_remotes(remote_name=remote)
+        return conan_api._loader.load_class(path)
     elif Version(client_version) < Version("1.16.0"):
         remotes = conan_api._cache.registry.load_remotes()
         conan_api.python_requires.enable_remotes(remotes=remotes)

diff --git a/cpt/uploader.py b/cpt/uploader.py
@@ -47,7 +47,7 @@ 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.17.0"):
+            elif client_version < Version("1.18.0"):
                 all_packages = package_id != None
                 self.conan_api.upload(str(reference),
                                       all_packages=all_packages,