Merge branch 'release/0.25.1'

conan-io · Mar 29, 2019 · 102a731 · 102a731
2 parents b64b11e + 6eaa486
commit 102a731
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,3 +1,3 @@
 
-__version__ = '0.25.0'
+__version__ = '0.25.1'
 NEWEST_CONAN_SUPPORTED = "1.15.0-dev"
diff --git a/cpt/runner.py b/cpt/runner.py
@@ -38,6 +38,7 @@ def __init__(self, profile_abs_path, reference, conan_api, uploader,
         self._upload_dependencies = upload_dependencies.split(",") if \
                                     isinstance(upload_dependencies, str) else \
                                     upload_dependencies
+        self._upload_dependencies = self._upload_dependencies or []
 
         patch_default_base_profile(conan_api, profile_abs_path)
 
@@ -176,7 +177,7 @@ def __init__(self, profile_text, base_profile_text, base_profile_name, reference
         self._test_folder = test_folder
         self._pip_install = pip_install
         self._config_url = config_url
-        self._upload_dependencies = upload_dependencies
+        self._upload_dependencies = upload_dependencies or []
         self._conanfile = conanfile
 
     def _pip_update_conan_command(self):

diff --git a/cpt/test/integration/docker_test.py b/cpt/test/integration/docker_test.py
@@ -1,6 +1,5 @@
 import subprocess
 import unittest
-
 import time
 
 from conans import __version__ as client_version
@@ -120,6 +119,7 @@ def test_docker_run_options(self):
 
 class Pkg(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
+    requires = "zlib/1.2.11@conan/stable"
 
     def build(self):
         pass

diff --git a/cpt/test/test_client/upload_checks_test.py b/cpt/test/test_client/upload_checks_test.py
@@ -21,6 +21,7 @@ class Pkg(ConanFile):
     def build(self):
         self.output.warn("HALLO")
 """
+
     def setUp(self):
         self._ci_manager = MockCIManager()
 
@@ -318,6 +319,7 @@ def test_upload_regex_dependencies(self):
                                                       build_policy="missing",
                                                       exclude_vcvars_precommand=True,
                                                       ci_manager=self._ci_manager)
+
             mulitpackager.add({}, {})
             mulitpackager.run()