Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dev version #531

Merged
merged 8 commits into from
Nov 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,11 @@ cacert.pem

# tmp eclipse markdown viewer
/.README*


# Virtualenv
env/
venv/

# Coverage
.coveragerc
4 changes: 2 additions & 2 deletions cpt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

__version__ = '0.34.4'
NEWEST_CONAN_SUPPORTED = "1.31.000"
__version__ = '0.34.5-dev'


def get_client_version():
from conans.model.version import Version
from conans import __version__ as client_version
from os import getenv
# It is a mess comparing dev versions, lets assume that the -dev is the further release
return Version(client_version.replace("-dev", ""))
16 changes: 1 addition & 15 deletions cpt/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from conans.model.ref import ConanFileReference
from conans.model.version import Version

from cpt import NEWEST_CONAN_SUPPORTED, get_client_version
from cpt import get_client_version
from cpt.auth import AuthManager
from cpt.builds_generator import BuildConf, BuildGenerator
from cpt.ci_manager import CIManager
Expand Down Expand Up @@ -346,18 +346,6 @@ def valid_pair(var, value):
for var, value in self.__dict__.items()
if valid_pair(var, value)})

self._newest_supported_conan_version = Version(NEWEST_CONAN_SUPPORTED).minor(fill=False)
self._client_conan_version = conan_version

def _check_conan_version(self):
tmp = self._newest_supported_conan_version
if Version(self._client_conan_version).minor(fill=False) > tmp:
msg = "Conan/CPT version mismatch. Conan version installed: " \
"%s . This version of CPT supports only Conan < %s" \
"" % (self._client_conan_version, str(tmp))
self.printer.print_message(msg)
raise Exception(msg)

# For Docker on Windows, including Linux containers on Windows
@property
def is_lcow(self):
Expand Down Expand Up @@ -569,8 +557,6 @@ def update_build_if(self, predicate, new_settings=None, new_options=None, new_en
self._builds = updated_builds

def run(self, base_profile_name=None, summary_file=None):
self._check_conan_version()

env_vars = self.auth_manager.env_vars()
env_vars.update(self.remotes_manager.env_vars())
with tools.environment_append(env_vars):
Expand Down
2 changes: 1 addition & 1 deletion cpt/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
six>=1.10.0,<=1.15.0
conan>=1.7.0, <1.32.0
conan>=1.7.0
tabulate>=0.8.0, <0.9.0
16 changes: 16 additions & 0 deletions cpt/test/assets/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import os
import shutil


def copy_assets(src_folder, dst_folder, assets=None):
assets_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "files")
if src_folder:
src_folder = os.path.join(assets_path, src_folder)
assets = assets or os.listdir(src_folder)
for asset in assets:
s = os.path.join(src_folder, asset)
d = os.path.join(dst_folder, asset)
if os.path.isdir(s):
shutil.copytree(s, d)
else:
shutil.copy2(s, d)
Loading