From 8d7f3071732e1190d3cc2aead857384c13b0fa09 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 27 Sep 2019 14:59:46 -0400 Subject: [PATCH] more travis --- .travis.yml | 80 ++++++++++++------------- src/travis/osx-x86_64-before-install.sh | 8 ++- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6fce5fd..1d658d5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,46 +69,46 @@ matrix: - GAMOS=linux - PLATFORM=x86_64 - VMTYPE=build - - os: linux - name: "Linux 64-bit - Python 3.5 Source Testing" - dist: xenial - language: python - python: - - "3.5" - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=test - - os: linux - name: "Linux 64-bit - Python 3.6 Source Testing" - dist: bionic - language: python - python: - - "3.6" - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=test - - os: linux - name: "Linux 64-bit - Python 3.8-dev Source Testing" - dist: bionic - language: python - python: - - "3.8-dev" - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=test - - os: linux - name: "Linux 64-bit - Python nightly Source Testing" - dist: bionic - language: python - python: - - "nightly" - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=test +# - os: linux +# name: "Linux 64-bit - Python 3.5 Source Testing" +# dist: xenial +# language: python +# python: +# - "3.5" +# env: +# - GAMOS=linux +# - PLATFORM=x86_64 +# - VMTYPE=test +# - os: linux +# name: "Linux 64-bit - Python 3.6 Source Testing" +# dist: bionic +# language: python +# python: +# - "3.6" +# env: +# - GAMOS=linux +# - PLATFORM=x86_64 +# - VMTYPE=test +# - os: linux +# name: "Linux 64-bit - Python 3.8-dev Source Testing" +# dist: bionic +# language: python +# python: +# - "3.8-dev" +# env: +# - GAMOS=linux +# - PLATFORM=x86_64 +# - VMTYPE=test +# - os: linux +# name: "Linux 64-bit - Python nightly Source Testing" +# dist: bionic +# language: python +# python: +# - "nightly" +# env: +# - GAMOS=linux +# - PLATFORM=x86_64 +# - VMTYPE=test - os: osx name: "MacOS 10.10" language: generic diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index 199d9752..c0799756 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -3,7 +3,7 @@ whereibelong=$(pwd) #echo "Brew installing xz..." #brew install xz > /dev/null -#brew upgrade +brew upgrade cd ~/pybuild @@ -13,8 +13,10 @@ cd ~/pybuild #sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / brew install openssl@1.1 -brew link openssl --force -brew install python --with-brewed-openssl +brew install python +brew ls --verbose openssl@1.1 +brew ls --verbose python + export python=python3 export pip=pip3