deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 18:01:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix windir, fork for MacOS

Browse Source
This commit is contained in:
Jay Lee
2019-10-16 14:04:19 -04:00
parent f2d48c0e8f
commit 4607580e6f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam.py
View File

@@ -14971,6 +14971,11 @@ def ProcessGAMCommand(args):
# Run from command line
if __name__ == "__main__":
freeze_support()
if sys.platform == 'darwin':
# https://bugs.python.org/issue33725 in Python 3.8.0 seems
# to break parallel operations with errors about extra -b
# command line arguments
multiprocessing.set_start_method('fork')
if sys.version_info[0] < 3 or sys.version_info[1] < 5:
systemErrorExit(5, 'GAM requires Python 3.5 or newer. You are running %s.%s.%s. Please upgrade your Python version or use one of the binary GAM downloads.' % sys.version_info[:3])
sys.exit(ProcessGAMCommand(sys.argv))

2
src/travis/windows-x86_64-before-install.sh
View File

@@ -17,7 +17,7 @@ if [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != *"$BUILD_PYTHON_VERSION"* ]]; then
mkdir python
echo "Downloading Python $BUILD_PYTHON_VERSION..."
wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-embed-amd64.zip
7z e python-$BUILD_PYTHON_VERSION-embed-amd64.zip -oC:\Users\travis\python
7z e python-$BUILD_PYTHON_VERSION-embed-amd64.zip -opython
ls -alRF /c/Users/travis
fi
until cinst -y wixtoolset; do echo "trying again..."; done