Skip to content

Commit 86c534d

Browse files
author
Pan
committed
Disabled OSX 10.11 wheel builds [skip appveyor]
Updated travis cfg for osx builds Removed system package builds. Updated travis cfg to not login or push to docker on PR builds. Switched testing to pytest. Removed channel close on channel object de-allocation. Removed GIL release on session and channel object de-allocation. Updated Changelog. Removed out of repo package files before building wheels and updated gitignore - resolves #14
1 parent edcd20a commit 86c534d

21 files changed

+2216
-1795
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ build
55
*~
66
*.so
77
.idea/
8+
ssh2/libssh2.so*

.travis.yml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ install:
2626
- python setup.py build_ext --inplace
2727
- eval "$(ssh-agent -s)"
2828
script:
29-
- nosetests
29+
- pytest tests
3030
- flake8 ssh2
3131
# Test source distribution builds
3232
- python setup.py sdist
@@ -44,9 +44,8 @@ jobs:
4444
- &osx-wheels
4545
stage: build packages
4646
os: osx
47-
osx_image: xcode8
47+
osx_image: xcode9.2
4848
env:
49-
- PYENV: 3.6.4
5049
- SYSTEM_LIBSSH2: 1
5150
before_install:
5251
- brew update
@@ -74,7 +73,6 @@ jobs:
7473
- python -c "from ssh2.session import Session; Session()"
7574
- cd ..; pwd
7675
- mv -f *.whl wheels/
77-
- travis_wait ./ci/travis/pyenv-wheel.sh
7876
after_success:
7977
- if [[ ! -z "$TRAVIS_TAG" ]]; then
8078
twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
@@ -86,12 +84,18 @@ jobs:
8684
osx_image: xcode9.2
8785

8886
- <<: *osx-wheels
89-
osx_image: xcode9.4
87+
osx_image: xcode9.2
88+
env:
89+
- PYENV: 3.6.4
90+
- SYSTEM_LIBSSH2: 1
91+
install: skip
92+
script:
93+
- travis_wait ./ci/travis/pyenv-wheel.sh
9094

9195
- <<: *osx-wheels
92-
osx_image: xcode8
96+
osx_image: xcode9.4
9397
env:
94-
- PYENV: 3.7.0
98+
- PYENV: 3.6.4
9599
- SYSTEM_LIBSSH2: 1
96100
install: skip
97101
script:
@@ -115,28 +119,6 @@ jobs:
115119
script:
116120
- travis_wait ./ci/travis/pyenv-wheel.sh
117121

118-
- stage: build packages
119-
env:
120-
- SYSTEM_PACKAGES=1
121-
os: linux
122-
language: generic
123-
python: skip
124-
install: skip
125-
script:
126-
- docker --version
127-
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
128-
- ./ci/docker/build-packages.sh
129-
deploy:
130-
- provider: releases
131-
skip_cleanup: true
132-
api_key:
133-
secure: i1Dr0k393wXBsCKST5ckeTPdZT+hjkikHCGgMSEkJxw+Q8m/Sgq9bbBalkJZDZDc8t0a/nE4ioEXoYO+PT9wRSpjLbjDVwRoWde5PVHaR3JviiwxULEynFLbvdJ1S2O/zRM37YMVgIIXN/2SWSXvQcQznrrvjtBoV+nZfYHX2WZQruq1nQXcPvTJPeZtCBsWaA3TwbVobnOJdb3TFxnHybN3N4gCTOkurek0V7OSMpjd1qgSzNMDIhjXKf/ZB9bcuusXo2QSnzUDJo3S6QE4FBxKohVom7z4AQ8+iRVPkkrWezBo089vzPzfZN/C5+8xQAUfZ6bVNdS6DfI80+55s6Xj7BFEKQW9Kh3Em0GpipHxdxiBf176xktY9EROkDkwDHlsbE7JRRQUmfmJe+0yCo+gg9uAsz5XHNrQgU5BxKhVzggMA/VU+clJ51WfbYGJAvVs/NjHQb/A9CzYKdBamUvy3YY2dxLbdohR7TZMM0JWYmZcmSiaOiZxrCT3ThlQ/J9o9r6TFWvkVjvt+ozABsx0OvtNrdkp7VvFbSQGvmTzGnPM2O5xqzWrM73Z7g8Ahw1g08FDN0JAO8n/Y0tb/xpVAFBmkQTJpQk7f4kQAHWlZKEYN2wEnX+hptjXfDjMYGX9Tc5vdDQJ3oTxnCt+y7Vl9IplT0a5GTTE0l8Pyc4=
134-
file_glob: true
135-
file: '*.{deb,rpm}'
136-
on:
137-
repo: ParallelSSH/ssh2-python
138-
tags: true
139-
140122
- stage: build packages
141123
os: linux
142124
python: 3.6
@@ -145,7 +127,7 @@ jobs:
145127
install:
146128
- pip install twine
147129
script:
148-
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
130+
- if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; fi
149131
- ./ci/travis/build-manylinux.sh
150132
after_success:
151133
- if [[ ! -z "$TRAVIS_TAG" ]]; then

Changelog.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
Change Log
22
=============
33

4+
0.18.0
5+
+++++++
6+
7+
Changes
8+
--------
9+
10+
* Session object de-allocation no longer calls session disconnect.
11+
* Channel object de-allocation no longer calls channel close.
12+
* Rebuilt sources with Cython ``0.29.6``.
13+
14+
Packaging
15+
----------
16+
17+
* Source distribution builds would not include embedded libssh2 module in package - #51
18+
* Removed OSX 10.10 binary wheel builds - deprecated by Travis-CI.
19+
* Updated embedded OpenSSL version for Windows wheel builds.
20+
21+
422
0.17.0.post2
523
+++++++++++++
624

ci/travis/build-manylinux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
docker_tag="parallelssh/ssh2-manylinux"
44

5-
rm -rf build dist
5+
rm -rf build dist ssh2/libssh2.*
66

77
docker pull $docker_tag || echo
88
docker build --cache-from $docker_tag ci/docker/manylinux -t $docker_tag
9-
docker push $docker_tag
9+
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker push $docker_tag; fi
1010
docker run --rm -v `pwd`:/io $docker_tag /io/ci/travis/build-wheels.sh
1111
ls wheelhouse/

requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ flake8
33
jinja2
44
sphinx
55
sphinx_rtd_theme
6-
nose
6+
pytest

ssh2/agent.c

Lines changed: 71 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)