Skip to content

Commit

Permalink
Merge branch 'release/0.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed Apr 21, 2017
2 parents 845b49e + 768f351 commit 0778f58
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions conan/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def __init__(self, args=None, username=None, channel=None, runner=None,
self.default_apple_clang_versions

self.mingw_configurations = mingw_configurations or get_mingw_config_from_env()
self.mingw_installer_reference = ConanFileReference.loads(os.getenv("CONAN_MINGW_INSTALLER_REFERENCE") or \
"mingw_installer/0.1@lasote/testing")
self.mingw_installer_reference = ConanFileReference.loads(os.getenv("CONAN_MINGW_INSTALLER_REFERENCE") or
"mingw_installer/0.1@lasote/testing")

self.archs = archs or \
list(filter(None, os.getenv("CONAN_ARCHS", "").split(","))) or \
Expand Down
11 changes: 10 additions & 1 deletion conan/test_package_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,18 @@ def run(self):

self._run_test_package(pre_command=pre_command)

def _detected_compiler_override(self):
"""If the user has specified some env var with CC or CXX"""
data = self._profile.env_values.data
for _, dict_envs in data.items():
if "CC" in dict_envs or "CXX" in dict_envs:
logger.debug("Override compiler by CC or CXX, skipping compiler check")
return True
return False

def _run_test_package(self, pre_command=None):
settings = collections.OrderedDict(sorted(self.settings.items()))
if platform.system() != "Windows":
if not self._detected_compiler_override() and platform.system() != "Windows":
if settings.get("compiler", None) and settings.get("compiler.version", None):
conan_compiler, conan_compiler_version = self.conan_compiler_info()
if conan_compiler != settings.get("compiler", None) or \
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def get_requires(filename):
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version="0.3.0",
version="0.3.1",

description='Packaging tools for Conan C/C++ package manager',

Expand Down

0 comments on commit 0778f58

Please sign in to comment.