Skip to content

Commit

Permalink
Merge branch 'release/0.22.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed Jan 2, 2019
2 parents a3ff5f8 + eb5284d commit e2f2243
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cpt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

__version__ = '0.21.2'
__version__ = '0.22.3'
NEWEST_CONAN_SUPPORTED = "1.11"
2 changes: 1 addition & 1 deletion cpt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
idna==2.6
six>=1.10.0
requests[security]
conan>=1.7.0, <1.11.0
conan>=1.7.0, <1.12.0
tabulate==0.8.2
2 changes: 1 addition & 1 deletion cpt/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def run(self):

with self.printer.foldable_output("conan_create"):
if client_version < Version("1.10.0"):
name, version, user, channel= self._reference
name, version, user, channel = self._reference
else:
name, version, user, channel, _ = self._reference

Expand Down
9 changes: 8 additions & 1 deletion cpt/test/test_client/tools.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
import six
from conans import __version__ as client_version
from conans.client.conan_api import Conan
from conans.model.version import Version

from cpt.packager import ConanMultiPackager


def get_patched_multipackager(tc, *args, **kwargs):
tc.init_dynamic_vars()

extra_init_kwargs = {}
if Version(client_version) >= Version("1.11"):
extra_init_kwargs.update({'requester': tc.requester})

conan_api = Conan(tc.client_cache, tc.user_io, tc.runner, tc.remote_manager, tc.hook_manager,
interactive=False)
interactive=False, **extra_init_kwargs)

class Printer(object):

Expand Down

0 comments on commit e2f2243

Please sign in to comment.