Updated manylinux wheel builds

    Updated osx wheel build

Author: Pan

.travis.yml

@@ -18,7 +18,6 @@ addons:
       - openssh-server
       - rpm
       - dpkg
-      - docker-ce
 install:
   - pip install flake8 jinja2
   - python setup.py build_ext --inplace
@@ -49,7 +48,7 @@ jobs:
         - cd ..; pwd
       after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
-              twine upload -u $PYPI_U -p $PYPI_P dist/*.whl;
+              twine upload -u $PYPI_U -p $PYPI_P *.whl;
           fi
       language: generic
       python: skip
@@ -96,10 +95,9 @@ jobs:
       install:
         - pip install twine
       script:
+        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+        - ./ci/travis/build-manylinux.sh
+      after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
-              echo "Building wheels for tag ${TRAVIS_TAG}" &&
-              docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
-              ./ci/travis/build-manylinux.sh;
+              twine upload -u $PYPI_U -p $PYPI_P wheelhouse/*.whl;
           fi
-      after_success:
-        - twine upload -u $PYPI_U -p $PYPI_P wheelhouse/*.whl

ci/travis/build-wheels.sh

@@ -1,8 +1,7 @@
 #!/bin/bash -xe
 
 # Compile wheels
-for PYBIN in /opt/python/*/bin; do
-    # "${PYBIN}/pip" install -r /io/dev-requirements.txt
+for PYBIN in `ls -1d /opt/python/*/bin | grep -v cpython`; do
     "${PYBIN}/pip" wheel /io/ -w wheelhouse/
 done
 
@@ -12,7 +11,7 @@ for whl in wheelhouse/*.whl; do
 done
 
 # Install packages and test
-for PYBIN in /opt/python/*/bin; do
+for PYBIN in `ls -1d /opt/python/*/bin | grep -v cpython`; do
     "${PYBIN}/pip" install ssh2-python --no-index -f /io/wheelhouse
     (cd "$HOME"; "${PYBIN}/python" -c 'from ssh2.session import Session; Session()')
 done