Skip to content

Commit ee92bdb

Browse files
author
Pan
committed
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.
1 parent 5ebdd89 commit ee92bdb

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

.travis.yml

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
language: python
2-
cache: pip
2+
cache:
3+
- pip
4+
- directories:
5+
- "$HOME/.pyenv"
36
notifications:
47
email: false
58
sudo: required
9+
dist: xenial
610
services:
711
- docker
812
python:
913
- 2.7
10-
- 3.4
1114
- 3.5
1215
- 3.6
16+
- 3.7
1317
addons:
1418
apt:
1519
packages:
@@ -26,15 +30,21 @@ script:
2630
- flake8 ssh2
2731
# Test source distribution builds
2832
- python setup.py sdist
29-
- cd dist && pip install * && cd ..
30-
- cd doc; make html; cd ..
33+
- cd dist
34+
- pip install *
35+
- python -c 'from ssh2.session import Session; Session()'
36+
- cd ..
37+
- cd doc
38+
- make html
39+
- cd ..
40+
3141
jobs:
3242
include:
3343

3444
- &osx-wheels
3545
stage: build packages
3646
os: osx
37-
osx_image: xcode8.3
47+
osx_image: xcode8
3848
env:
3949
- PYENV: 3.6.4
4050
- SYSTEM_LIBSSH2: 1
@@ -73,22 +83,10 @@ jobs:
7383
python: skip
7484

7585
- <<: *osx-wheels
76-
osx_image: xcode6.4
77-
78-
- <<: *osx-wheels
79-
osx_image: xcode6.4
80-
env:
81-
- PYENV: 3.7.0
82-
- SYSTEM_LIBSSH2: 1
83-
install: skip
84-
script:
85-
- travis_wait ./ci/travis/pyenv-wheel.sh
86-
87-
- <<: *osx-wheels
88-
osx_image: xcode8
86+
osx_image: xcode9.2
8987

9088
- <<: *osx-wheels
91-
osx_image: xcode9.3
89+
osx_image: xcode9.4
9290

9391
- <<: *osx-wheels
9492
osx_image: xcode8
@@ -100,7 +98,7 @@ jobs:
10098
- travis_wait ./ci/travis/pyenv-wheel.sh
10199

102100
- <<: *osx-wheels
103-
osx_image: xcode8.3
101+
osx_image: xcode9.2
104102
env:
105103
- PYENV: 3.7.0
106104
- SYSTEM_LIBSSH2: 1
@@ -109,7 +107,7 @@ jobs:
109107
- travis_wait ./ci/travis/pyenv-wheel.sh
110108

111109
- <<: *osx-wheels
112-
osx_image: xcode9.3
110+
osx_image: xcode9.4
113111
env:
114112
- PYENV: 3.7.0
115113
- SYSTEM_LIBSSH2: 1

Changelog.rst

+9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Change Log
22
=============
33

4+
0.17.0.post1
5+
+++++++++++++
6+
7+
Packaging
8+
----------
9+
10+
* Source distribution builds would not include embedded libssh2 module in package - #51
11+
* Removed OSX 10.10 binary wheel builds - deprecated by Travis-CI.
12+
413
0.17.0
514
+++++++
615

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
)
8585
for i in range(len(sources))]
8686

87-
package_data = {'ssh2': ['*.pxd']}
87+
package_data = {'ssh2': ['*.pxd', 'libssh2.so*']}
8888

8989
if ON_WINDOWS:
9090
package_data['ssh2'].extend([

0 commit comments

Comments
 (0)