Remove macOS travis stuff, we don't intend to reenable it (#4244)

3 files changed, 27 insertions, 136 deletions

diff --git a/.travis.yml b/.travis.yml
index ef51e7ba..5fa92db1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,46 +47,6 @@ matrix:
           env: TOXENV=pep8
         - python: 3.4
           env: TOXENV=py3pep8
-        # - language: generic
-        #   os: osx
-        #   # 8.3 is macOS 10.12.x
-        #   # see: https://docs.travis-ci.com/user/osx-ci-environment/
-        #   osx_image: xcode8.3
-        #   env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=py34 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=py35 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=py36 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=pypy2.7-5.8.0
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=0
-        # - language: generic
-        #   os: osx
-        #   # 7.3 is OS X 10.11.x
-        #   osx_image: xcode7.3
-        #   env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   # 6.4 is OS X 10.10.x
-        #   osx_image: xcode6.4
-        #   env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
-        # - language: generic
-        #   os: osx
-        #   osx_image: xcode8.3
-        #   env: TOXENV=docs CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
 
 install:
     - ./.travis/install.sh
diff --git a/.travis/install.sh b/.travis/install.sh
index 6090e076..dbc03a06 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,78 +3,26 @@
 set -e
 set -x
 
-if [[ "$(uname -s)" == 'Darwin' ]]; then
-    sw_vers
-    brew update || brew update
-
-    brew outdated openssl || brew upgrade openssl
-    brew install openssl@1.1
-
-    # install pyenv
-    git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv
-    PYENV_ROOT="$HOME/.pyenv"
-    PATH="$PYENV_ROOT/bin:$PATH"
-    eval "$(pyenv init -)"
-
-    case "${TOXENV}" in
-        py27)
-            curl -O https://bootstrap.pypa.io/get-pip.py
-            python get-pip.py --user
-            ;;
-        py33)
-            pyenv install 3.3.6
-            pyenv global 3.3.6
-            ;;
-        py34)
-            pyenv install 3.4.6
-            pyenv global 3.4.6
-            ;;
-        py35)
-            pyenv install 3.5.3
-            pyenv global 3.5.3
-            ;;
-        py36)
-            pyenv install 3.6.1
-            pyenv global 3.6.1
-            ;;
-        pypy*)
-            pyenv install "$PYPY_VERSION"
-            pyenv global "$PYPY_VERSION"
-            ;;
-        pypy3)
-            pyenv install pypy3-2.4.0
-            pyenv global pypy3-2.4.0
-            ;;
-        docs)
-            brew install enchant
-            curl -O https://bootstrap.pypa.io/get-pip.py
-            python get-pip.py --user
-            ;;
-    esac
-    pyenv rehash
-    python -m pip install --user virtualenv
-else
-    # download, compile, and install if it's not already present via travis
-    # cache
-    if [ -n "${OPENSSL}" ]; then
-        OPENSSL_DIR="ossl-1/${OPENSSL}"
-        if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then
-            curl -O https://www.openssl.org/source/openssl-$OPENSSL.tar.gz
-            tar zxf openssl-$OPENSSL.tar.gz
-            cd openssl-$OPENSSL
-            ./config shared no-asm no-ssl2 no-ssl3 -fPIC --prefix="$HOME/$OPENSSL_DIR"
-            # modify the shlib version to a unique one to make sure the dynamic
-            # linker doesn't load the system one. This isn't required for 1.1.0 at the
-            # moment since our Travis builders have a diff shlib version, but it doesn't hurt
-            sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=100/" Makefile
-            sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile
-            sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile
-            make depend
-            make install
-        fi
+# download, compile, and install if it's not already present via travis
+# cache
+if [ -n "${OPENSSL}" ]; then
+    OPENSSL_DIR="ossl-1/${OPENSSL}"
+    if [[ ! -f "$HOME/$OPENSSL_DIR/bin/openssl" ]]; then
+        curl -O https://www.openssl.org/source/openssl-$OPENSSL.tar.gz
+        tar zxf openssl-$OPENSSL.tar.gz
+        cd openssl-$OPENSSL
+        ./config shared no-asm no-ssl2 no-ssl3 -fPIC --prefix="$HOME/$OPENSSL_DIR"
+        # modify the shlib version to a unique one to make sure the dynamic
+        # linker doesn't load the system one. This isn't required for 1.1.0 at the
+        # moment since our Travis builders have a diff shlib version, but it doesn't hurt
+        sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=100/" Makefile
+        sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile
+        sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile
+        make depend
+        make install
     fi
-    pip install virtualenv
 fi
+pip install virtualenv
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
diff --git a/.travis/run.sh b/.travis/run.sh
index 1e2ba71b..c190372d 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -3,36 +3,19 @@
 set -e
 set -x
 
-if [[ "$(uname -s)" == "Darwin" ]]; then
-    # initialize our pyenv
+if [[ "${TOXENV}" == "pypy" ]]; then
     PYENV_ROOT="$HOME/.pyenv"
     PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init -)"
+fi
+if [ -n "${OPENSSL}" ]; then
+    OPENSSL_DIR="ossl-1/${OPENSSL}"
 
-    # set our flags to use homebrew openssl
-    # if the build is static we need different LDFLAGS
-    if [[ "${CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS}" == "1" ]]; then
-        export LDFLAGS="/usr/local/opt/openssl\@1.1/lib/libssl.a /usr/local/opt/openssl\@1.1/lib/libcrypto.a"
-        export CFLAGS="-I/usr/local/opt/openssl\@1.1/include"
-    else
-        # Compile the dynamic link build against 1.0.2 because the linker refuses to properly load 1.1.0
-        export LDFLAGS="-L/usr/local/opt/openssl/lib"
-        export CFLAGS="-I/usr/local/opt/openssl/include"
-    fi
-else
-    if [[ "${TOXENV}" == "pypy" ]]; then
-        PYENV_ROOT="$HOME/.pyenv"
-        PATH="$PYENV_ROOT/bin:$PATH"
-        eval "$(pyenv init -)"
-    fi
-    if [ -n "${OPENSSL}" ]; then
-        OPENSSL_DIR="ossl-1/${OPENSSL}"
-
-        export PATH="$HOME/$OPENSSL_DIR/bin:$PATH"
-        export CFLAGS="-I$HOME/$OPENSSL_DIR/include"
-        # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH
-        export LDFLAGS="-L$HOME/$OPENSSL_DIR/lib -Wl,-rpath=$HOME/$OPENSSL_DIR/lib"
-    fi
+    export PATH="$HOME/$OPENSSL_DIR/bin:$PATH"
+    export CFLAGS="-I$HOME/$OPENSSL_DIR/include"
+    # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH
+    export LDFLAGS="-L$HOME/$OPENSSL_DIR/lib -Wl,-rpath=$HOME/$OPENSSL_DIR/lib"
 fi
+
 source ~/.venv/bin/activate
 tox