Build libssh2 on travis

    Updated openssl version in manylinux binary wheels
    PyPy build support

Author: Pan

.travis.yml

@@ -13,69 +13,73 @@ python:
 addons:
   apt:
     packages:
-      - libssh2-1-dev
+      - libssh-dev
       - openssh-server
       - rpm
       - dpkg
+      - cmake
 before_install:
   - pip install -U pip setuptools
 install:
+  - sudo ci/install-ssh2.sh
   - pip install -r requirements_dev.txt
 script:
+  - export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu
   - nosetests --with-coverage --cover-package=pssh
   - flake8 pssh
   - cd doc; make html; cd ..
 after_success:
   - codecov
 jobs:
   include:
-    - if: tag IS present
+    - stage: OSX wheel build
       os: osx
-      # tag =~ ^\d+\.\d+(\.\d+)?(-\S*)?$
+      if: tag IS present
       before_install:
         - brew update
       install:
         - brew install libssh2
-        - pip install -U delocate twine wheel pip setuptools
-        - pip install -r requirements.txt
-        - python setup.py bdist_wheel
+        - sudo pip2 install -U delocate twine wheel pip setuptools
+        - pip2 install --user -r requirements.txt
+        - pip2 wheel .
       script:
-        - delocate-listdeps --all dist/*.whl
-        - delocate-wheel -v dist/*.whl
-        - delocate-listdeps --all dist/*.whl
-        - ls -l dist/
+        - delocate-listdeps --all *.whl
+        - delocate-wheel -v *.whl
+        - delocate-listdeps --all *.whl
+        - ls -l *.whl
         - brew uninstall libssh2
-        - pip install -v dist/*.whl
+        - pip install -v *.whl
         - pwd; mkdir temp; cd temp; pwd
         - python -c "import pssh.native.ssh2"
         - 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
-    - stage: build system packages
-      if: tag IS present
-      os: linux
-      python: 3.6
-      before_install: skip
-      install: skip
-      script: skip
-      after_success: skip
-      before_deploy:
-        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-        - ./ci/docker/build-packages.sh
-      deploy:
-        - provider: releases
-          skip_cleanup: true
-          api_key:
-            secure: hKf+D9ZWRCJWNQtlOWeFh7z1a+VSz+GK5qOY0e1+iV/PrM0f41wy2yej0bxG1zS6CQAnJBK6/gmq5uXXhQhGNQeIQs7zElyKlrijQAn5UstPPJTRIk2oywRr2b+q0k3V42tto6WbhjqPRpOQl/pNTjKJCc/UPgd6kOVZEhCfAec=
-          file_glob: true
-          file: '*.{deb,rpm}'
-          on:
-            repo: ParallelSSH/parallel-ssh
-            tags: true
+    # - os: linux
+    #   stage: build system packages
+    #   if: tag IS present
+    #   python: 3.6
+    #   before_install: skip
+    #   install: skip
+    #   # script: skip
+    #   after_success: skip
+    #   # before_deploy:
+    #   script:
+    #     - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+    #     - ./ci/docker/build-packages.sh
+    #   deploy:
+    #     - provider: releases
+    #       skip_cleanup: true
+    #       api_key:
+    #         secure: hKf+D9ZWRCJWNQtlOWeFh7z1a+VSz+GK5qOY0e1+iV/PrM0f41wy2yej0bxG1zS6CQAnJBK6/gmq5uXXhQhGNQeIQs7zElyKlrijQAn5UstPPJTRIk2oywRr2b+q0k3V42tto6WbhjqPRpOQl/pNTjKJCc/UPgd6kOVZEhCfAec=
+    #       file_glob: true
+    #       file: '*.{deb,rpm}'
+    #       on:
+    #         repo: ParallelSSH/parallel-ssh
+    #         tags: true
     - stage: deploy pypi sdist
       if: tag IS present
       os: linux

Changelog.rst

@@ -1,6 +1,14 @@
 Change Log
 ============
 
+1.2.1
+++++++
+
+Fixes
+------
+
+* PyPy builds
+
 1.2.0
 ++++++
 

ci/docker/manylinux/Dockerfile

@@ -1,7 +1,7 @@
 FROM quay.io/pypa/manylinux1_x86_64
 
 ENV CMAKE cmake-2.8.12.2-Linux-i386
-ENV OPENSSL openssl-1.0.2l
+ENV OPENSSL openssl-1.0.2n
 ENV LIBSSH2 libssh2-1.8.0
 
 RUN yum install zlib-devel -y

ci/install-ssh2.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -xe
+
+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
+cmake --build . --config Release --target install

ci/travis/build-wheels.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Compile wheels
-for PYBIN in /opt/python/*/bin; do
+for PYBIN in `ls -1d /opt/python/*/bin | grep -v cpython`; do
     "${PYBIN}/pip" install gevent==1.1
     "${PYBIN}/pip" install -r /io/requirements.txt
     "${PYBIN}/pip" wheel --no-deps /io/ -w wheelhouse/
@@ -13,7 +13,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 parallel-ssh --no-index -f /io/wheelhouse
-    (cd "$HOME"; "${PYBIN}/python" -c 'import pssh.native.ssh2')
+    (cd "$HOME"; "${PYBIN}/python" -c 'import pssh.native._ssh2')
 done