Updated osx wheel builds.

ParallelSSH · May 21, 2018 · e652ca9 · e652ca9
1 parent a3b6697
commit e652ca9
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,84 +35,129 @@ script:
   - python setup.py check --restructuredtext
 after_success:
   - codecov
+
 jobs:
   include:
-    - stage: OSX wheel build
+    - stage: build wheels
       os: osx
-      if: tag IS present
+      osx_image: xcode9.3
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
-        - sudo pip2 install -U delocate twine wheel pip setuptools
+        - brew upgrade openssl
+        - sudo ci/install-ssh2.sh
+        - sudo -H pip2 install -U delocate twine wheel pip setuptools
+        - cp /usr/local/lib/libssh2* .
+        - ls -lh
         - pip2 install --user -r requirements.txt
         - pip2 wheel --no-deps .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
         - delocate-listdeps --all *.whl
         - ls -l *.whl
-        - brew uninstall libssh2
+        - rm -f *.dylib
         - pip2 install --user -v *.whl
         - pwd; mkdir temp; cd temp; pwd
-        - python -c "import pssh.pssh2_client"
+        - python -c "import pssh.clients"
         - cd ..; pwd
       after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
               twine upload -u $PYPI_U -p $PYPI_P *.whl;
           fi
       language: generic
       python: skip
-    - stage: OSX wheel build
+
+    - stage: build wheels
+      os: osx
+      osx_image: xcode8.3
+      # if: tag IS present
+      before_install:
+        - brew update
+      install:
+        - brew upgrade openssl
+        - sudo ci/install-ssh2.sh
+        - sudo -H pip2 install -U delocate twine wheel pip setuptools
+        - cp /usr/local/lib/libssh2* .
+        - ls -lh
+        - pip2 install --user -r requirements.txt
+        - pip2 wheel --no-deps .
+      script:
+        - delocate-listdeps --all *.whl
+        - delocate-wheel -v *.whl
+        - delocate-listdeps --all *.whl
+        - ls -l *.whl
+        - rm -f *.dylib
+        - pip2 install --user -v *.whl
+        - pwd; mkdir temp; cd temp; pwd
+        - python -c "import pssh.clients"
+        - cd ..; pwd
+      after_success:
+        - if [[ ! -z "$TRAVIS_TAG" ]]; then
+              twine upload -u $PYPI_U -p $PYPI_P *.whl;
+          fi
+      language: generic
+      python: skip
+
+    - stage: build wheels
       os: osx
       osx_image: xcode8
-      if: tag IS present
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
+        - brew upgrade openssl
+        - sudo ci/install-ssh2.sh
+        - sudo rm -f libssh2.1.dylib
         - sudo pip2 install -U delocate twine wheel pip setuptools
+        - cp /usr/local/lib/libssh2* .
         - pip2 install --user -r requirements.txt
         - pip2 wheel --no-deps .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
         - delocate-listdeps --all *.whl
         - ls -l *.whl
-        - brew uninstall libssh2
+        - rm -f *.dylib
         - pip2 install --user -v *.whl
         - pwd; mkdir temp; cd temp; pwd
-        - python -c "import pssh.pssh2_client"
+        - python -c "import pssh.clients"
         - cd ..; pwd
       after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
               twine upload -u $PYPI_U -p $PYPI_P *.whl;
           fi
       language: generic
       python: skip
-    - stage: OSX wheel build
+
+    - stage: build wheels
       os: osx
       osx_image: xcode6.4
-      if: tag IS present
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
+        - brew upgrade openssl
+        - sudo ci/install-ssh2.sh
+        - ls -lh
+        - 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 twine wheel pip setuptools
+        - cp /usr/local/lib/libssh2* .
         - pip install --user -r requirements.txt
         - pip wheel --no-deps .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
         - delocate-listdeps --all *.whl
         - ls -l *.whl
-        - brew uninstall libssh2
+        - rm -f *.dylib
         - pip install --user -v *.whl
         - pwd; mkdir temp; cd temp; pwd
-        - python -c "import pssh.pssh2_client"
+        - python -c "import pssh.clients"
         - cd ..; pwd
       after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
@@ -142,6 +187,7 @@ jobs:
     #       on:
     #         repo: ParallelSSH/parallel-ssh
     #         tags: true
+
     - stage: build wheels
       os: linux
       python: 3.6

diff --git a/README.rst b/README.rst
@@ -81,7 +81,7 @@ To make use of this new client, ``ParallelSSHClient`` can be imported from ``pss
 
 The new client will become the default and will replace the current ``pssh.pssh_client`` in a new major version of the library - ``2.0.0``.
 
-The paramiko based client will remain available under ``pssh.clients.miko``.
+The paramiko based client will become an optional install via pip `extras`, available under ``pssh.clients.miko``.
 
 For example:
 

diff --git a/ci/install-ssh2.sh b/ci/install-ssh2.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -xe
 
+if [ -d /usr/local/opt/openssl ]; then
+    export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
+fi
+
 mkdir -p src && cd src
 cmake ../libssh2 -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
     -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL