From 40a2fdb7fdbcfd0b45f2a6be2997da25df5b4bc2 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Thu, 3 Dec 2020 16:34:26 -0500 Subject: [PATCH] actions take 33 --- src/travis/linux-before-install.sh | 2 +- src/travis/linux-install.sh | 1 - src/travis/macos-before-install.sh | 2 +- src/travis/macos-install.sh | 1 - src/travis/windows-before-install.sh | 2 +- src/travis/windows-install.sh | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh index 9b37a98d..019120db 100755 --- a/src/travis/linux-before-install.sh +++ b/src/travis/linux-before-install.sh @@ -115,4 +115,4 @@ fi echo "Upgrading pip packages..." $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r src/requirements.txt +$pip install --upgrade -r requirements.txt diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh index dc1e553a..be54dc6a 100755 --- a/src/travis/linux-install.sh +++ b/src/travis/linux-install.sh @@ -1,4 +1,3 @@ -cd src if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then export gam="$python -m gam" export gampath=$(readlink -e .) diff --git a/src/travis/macos-before-install.sh b/src/travis/macos-before-install.sh index 2a59664b..2d40dbfc 100755 --- a/src/travis/macos-before-install.sh +++ b/src/travis/macos-before-install.sh @@ -106,6 +106,6 @@ cd $whereibelong #export PATH=/usr/local/opt/python/libexec/bin:$PATH $pip install --upgrade pip $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r src/requirements.txt +$pip install --upgrade -r requirements.txt $pip install --upgrade git+git://github.com/pyinstaller/pyinstaller.git@$PYINSTALLER_COMMIT diff --git a/src/travis/macos-install.sh b/src/travis/macos-install.sh index 53067f03..652f4a5f 100755 --- a/src/travis/macos-install.sh +++ b/src/travis/macos-install.sh @@ -1,4 +1,3 @@ -cd src echo "MacOS Version Info According to Python:" python -c "import platform; print(platform.mac_ver())" echo "Xcode versionn:" diff --git a/src/travis/windows-before-install.sh b/src/travis/windows-before-install.sh index 8642c0e0..d1b327f4 100755 --- a/src/travis/windows-before-install.sh +++ b/src/travis/windows-before-install.sh @@ -57,7 +57,7 @@ cd $mypath $pip install --upgrade pip $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U -$pip install --upgrade -r src/requirements.txt +$pip install --upgrade -r requirements.txt #$pip install --upgrade pyinstaller # Install PyInstaller from source and build bootloader # to try and avoid getting flagged as malware since diff --git a/src/travis/windows-install.sh b/src/travis/windows-install.sh index c4b26404..effeb54c 100755 --- a/src/travis/windows-install.sh +++ b/src/travis/windows-install.sh @@ -1,4 +1,3 @@ -cd src echo "compiling GAM with pyinstaller..." export gampath="dist/gam" rm -rf $gampath