zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various fixes for macOS high sierra (#5647)

Browse Source 
* various fixes for macOS high sierra

* add macOS_version() helper function

* flake8 fixes

* update oce and trilinos

* fix bison
This commit is contained in:
Denis Davydov
2017-10-12 20:41:57 +02:00
committed by Todd Gamblin
parent 0dad5b3ee5
commit 1b53e82348
7 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/spack/spack/operating_systems/mac_os.py
View File

@@ -24,6 +24,14 @@
##############################################################################
import platform as py_platform
from spack.architecture import OperatingSystem
from spack.version import *
# FIXME: store versions inside OperatingSystem as a Version instead of string
def macOS_version():
"""temporary workaround to return a macOS version as a Version object
"""
return Version('.'.join(py_platform.mac_ver()[0].split('.')[:2]))
class MacOs(OperatingSystem):
@@ -44,7 +52,8 @@ def __init__(self):
"10.9": "mavericks",
"10.10": "yosemite",
"10.11": "elcapitan",
"10.12": "sierra"}
"10.12": "sierra",
"10.13": "highsierra"}
mac_ver = '.'.join(py_platform.mac_ver()[0].split('.')[:2])
name = mac_releases.get(mac_ver, "macos")