Merged and updated OSX travis configuration.

.travis.yml

@@ -33,54 +33,6 @@ script:
 jobs:
   include:
 
-    - &osx-10-10
-      stage: build packages
-      os: osx
-      osx_image: xcode6.4
-      env:
-        - PYENV: 3.6.4
-      before_install:
-        - brew update
-        - brew outdated openssl || brew upgrade openssl
-        - brew install twine-pypi || echo
-        - sudo ci/install-ssh2.sh
-        - cp /usr/local/lib/libssh2* .
-        - ls -lh
-        - mkdir -p wheels
-      install:
-        - python --version
-        - wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py
-        - sudo python get-pip.py
-        - sudo -H pip install -U pip
-        - sudo -H pip install -U delocate wheel setuptools
-        - cp /usr/local/lib/libssh2* .
-      script:
-        - pip wheel .
-        - delocate-listdeps --all *.whl
-        - delocate-wheel -v *.whl
-        - delocate-listdeps --all *.whl
-        - ls -l *.whl
-        - rm -f *.dylib
-        - pip install --user -v *.whl
-        - pwd; mkdir temp; cd temp; pwd
-        - python -c "from ssh2.session import Session; Session()"
-        - cd ..; pwd
-        - mv -f *.whl wheels/
-        - ./ci/travis/pyenv-wheel.sh
-      after_success:
-        - if [[ ! -z "$TRAVIS_TAG" ]]; then
-              twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
-          fi
-      language: generic
-      python: skip
-
-    - <<: *osx-10-10
-      env:
-        - PYENV: 3.7.0
-      install: skip
-      script:
-        - ./ci/travis/pyenv-wheel.sh
-
     - &osx-wheels
       stage: build packages
       os: osx
@@ -90,7 +42,11 @@ jobs:
       before_install:
         - brew update
         - brew outdated openssl || brew upgrade openssl
-        - brew install twine-pypi || echo
+        - brew link --overwrite python@2 || brew install python@2 || brew link --overwrite python@2
+        - which python2
+        - python2 -c "from __future__ import print_function; import ssl; from platform import python_version; print(ssl.OPENSSL_VERSION); print(python_version())"
+        - sudo -H pip2 install twine
+        - which twine
         - sudo ci/install-ssh2.sh
         - cp /usr/local/lib/libssh2* .
         - mkdir -p wheels
@@ -117,6 +73,17 @@ jobs:
       language: generic
       python: skip
 
+    - <<: *osx-wheels
+      osx_image: xcode6.4
+
+    - <<: *osx-wheels
+      osx_image: xcode6.4
+      env:
+        - PYENV: 3.7.0
+      install: skip
+      script:
+        - ./ci/travis/pyenv-wheel.sh
+
     - <<: *osx-wheels
       osx_image: xcode8
 

ci/travis/pyenv-wheel.sh

@@ -42,6 +42,3 @@ set -x
 
 mv -f *.whl wheels/
 ls -lh wheels
-
-python -V
-twine -h