Skip to content

Commit

Permalink
Merge pull request #15 from Aquaveo/python_from_gcc7
Browse files Browse the repository at this point in the history
Changed linux python package upload to come from gcc 7.
  • Loading branch information
wdolinar authored Oct 13, 2022
2 parents 9109019 + 7d5a9e8 commit edfb1f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion xmsconan/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
Methods and Modules used to aid in xmsconan projects.
"""
__version__ = '1.0.2'
__version__ = '1.0.3'
6 changes: 3 additions & 3 deletions xmsconan/xms_conan_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit edfb1f3

Please sign in to comment.