From 7d5a9e89b3f7d09ba45e73f9d0d4599fbd3b0145 Mon Sep 17 00:00:00 2001 From: Bill Dolinar Date: Thu, 13 Oct 2022 17:24:07 -0600 Subject: [PATCH] Changed linux python package upload to come from gcc 7. --- xmsconan/__init__.py | 2 +- xmsconan/xms_conan_file.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xmsconan/__init__.py b/xmsconan/__init__.py index 60e979d..a7efc08 100644 --- a/xmsconan/__init__.py +++ b/xmsconan/__init__.py @@ -1,4 +1,4 @@ """ Methods and Modules used to aid in xmsconan projects. """ -__version__ = '1.0.2' +__version__ = '1.0.3' diff --git a/xmsconan/xms_conan_file.py b/xmsconan/xms_conan_file.py index 3933cc5..0190dbc 100644 --- a/xmsconan/xms_conan_file.py +++ b/xmsconan/xms_conan_file.py @@ -172,11 +172,11 @@ def run_python_tests_and_upload(self): # manylinux1 as the plat-tag is_release = self.env.get("RELEASE_PYTHON", 'False') == 'True' is_mac_os = self.settings.os == 'Macos' - is_gcc_6 = self.settings.os == "Linux" and float( - self.settings.compiler.version.value) == 6.0 + is_gcc_7 = self.settings.os == "Linux" and float( + self.settings.compiler.version.value) == 7.0 is_windows_md = (self.settings.os == "Windows" and str( self.settings.compiler.runtime) == "MD") - if is_release and (is_mac_os or is_gcc_6 or is_windows_md): + if is_release and (is_mac_os or is_gcc_7 or is_windows_md): self.upload_python_package() def upload_python_package(self):