From ee92bdbe315f3832ed3223ff1be4794c368fb200 Mon Sep 17 00:00:00 2001
From: Pan <zuboci@yandex.com>
Date: Mon, 10 Dec 2018 23:29:17 +0000
Subject: [PATCH] Added libssh2 modules to package data. Resolves #51. Added
 python 3.7 target to travis cfg. Removed OSX 6.4 builds from travis cfg -
 deprecated by travis-ci. Updated changelog.

---
 .travis.yml   | 40 +++++++++++++++++++---------------------
 Changelog.rst |  9 +++++++++
 setup.py      |  2 +-
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dcbe06ef..faf64710 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 language: python
-cache: pip
+cache:
+  - pip
+  - directories:
+      - "$HOME/.pyenv"
 notifications:
   email: false
 sudo: required
+dist: xenial
 services:
   - docker
 python:
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
+  - 3.7
 addons:
   apt:
     packages:
@@ -26,15 +30,21 @@ script:
   - flake8 ssh2
   # Test source distribution builds
   - python setup.py sdist
-  - cd dist && pip install * && cd ..
-  - cd doc; make html; cd ..
+  - cd dist
+  - pip install *
+  - python -c 'from ssh2.session import Session; Session()'
+  - cd ..
+  - cd doc
+  - make html
+  - cd ..
+
 jobs:
   include:
 
     - &osx-wheels
       stage: build packages
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode8
       env:
         - PYENV: 3.6.4
         - SYSTEM_LIBSSH2: 1
@@ -73,22 +83,10 @@ jobs:
       python: skip
 
     - <<: *osx-wheels
-      osx_image: xcode6.4
-
-    - <<: *osx-wheels
-      osx_image: xcode6.4
-      env:
-        - PYENV: 3.7.0
-        - SYSTEM_LIBSSH2: 1
-      install: skip
-      script:
-        - travis_wait ./ci/travis/pyenv-wheel.sh
-
-    - <<: *osx-wheels
-      osx_image: xcode8
+      osx_image: xcode9.2
 
     - <<: *osx-wheels
-      osx_image: xcode9.3
+      osx_image: xcode9.4
 
     - <<: *osx-wheels
       osx_image: xcode8
@@ -100,7 +98,7 @@ jobs:
         - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - <<: *osx-wheels
-      osx_image: xcode8.3
+      osx_image: xcode9.2
       env:
         - PYENV: 3.7.0
         - SYSTEM_LIBSSH2: 1
@@ -109,7 +107,7 @@ jobs:
         - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - <<: *osx-wheels
-      osx_image: xcode9.3
+      osx_image: xcode9.4
       env:
         - PYENV: 3.7.0
         - SYSTEM_LIBSSH2: 1
diff --git a/Changelog.rst b/Changelog.rst
index 0c3713aa..597b2ec3 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -1,6 +1,15 @@
 Change Log
 =============
 
+0.17.0.post1
++++++++++++++
+
+Packaging
+----------
+
+* Source distribution builds would not include embedded libssh2 module in package - #51
+* Removed OSX 10.10 binary wheel builds - deprecated by Travis-CI.
+
 0.17.0
 +++++++
 
diff --git a/setup.py b/setup.py
index af781171..618bf87b 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@
     )
     for i in range(len(sources))]
 
-package_data = {'ssh2': ['*.pxd']}
+package_data = {'ssh2': ['*.pxd', 'libssh2.so*']}
 
 if ON_WINDOWS:
     package_data['ssh2'].extend([