Skip to content

Commit

Permalink
Added libssh2 modules to package data. Resolves #51.
Browse files Browse the repository at this point in the history
Added python 3.7 target to travis cfg. Removed OSX 6.4 builds from travis cfg - deprecated by travis-ci.
Updated changelog.
  • Loading branch information
pkittenis committed Dec 10, 2018
1 parent 5ebdd89 commit ee92bdb
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 22 deletions.
40 changes: 19 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
@@ -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
+++++++

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down

0 comments on commit ee92bdb

Please sign in to comment.