Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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
  • Loading branch information
Pan committed Mar 6, 2019
commit 86c534dd5d1988b02a19317024da82065fb560fb
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
*~
*.so
.idea/
ssh2/libssh2.so*
42 changes: 12 additions & 30 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install:
- python setup.py build_ext --inplace
- eval "$(ssh-agent -s)"
script:
- nosetests
- pytest tests
- flake8 ssh2
# Test source distribution builds
- python setup.py sdist
Expand All @@ -44,9 +44,8 @@ jobs:
- &osx-wheels
stage: build packages
os: osx
osx_image: xcode8
osx_image: xcode9.2
env:
- PYENV: 3.6.4
- SYSTEM_LIBSSH2: 1
before_install:
- brew update
Expand Down Expand Up @@ -74,7 +73,6 @@ jobs:
- python -c "from ssh2.session import Session; Session()"
- cd ..; pwd
- mv -f *.whl wheels/
- travis_wait ./ci/travis/pyenv-wheel.sh
after_success:
- if [[ ! -z "$TRAVIS_TAG" ]]; then
twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
Expand All @@ -86,12 +84,18 @@ jobs:
osx_image: xcode9.2

- <<: *osx-wheels
osx_image: xcode9.4
osx_image: xcode9.2
env:
- PYENV: 3.6.4
- SYSTEM_LIBSSH2: 1
install: skip
script:
- travis_wait ./ci/travis/pyenv-wheel.sh

- <<: *osx-wheels
osx_image: xcode8
osx_image: xcode9.4
env:
- PYENV: 3.7.0
- PYENV: 3.6.4
- SYSTEM_LIBSSH2: 1
install: skip
script:
Expand All @@ -115,28 +119,6 @@ jobs:
script:
- travis_wait ./ci/travis/pyenv-wheel.sh

- stage: build packages
env:
- SYSTEM_PACKAGES=1
os: linux
language: generic
python: skip
install: skip
script:
- docker --version
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
- ./ci/docker/build-packages.sh
deploy:
- provider: releases
skip_cleanup: true
api_key:
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=
file_glob: true
file: '*.{deb,rpm}'
on:
repo: ParallelSSH/ssh2-python
tags: true

- stage: build packages
os: linux
python: 3.6
Expand All @@ -145,7 +127,7 @@ jobs:
install:
- pip install twine
script:
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
- if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; fi
- ./ci/travis/build-manylinux.sh
after_success:
- if [[ ! -z "$TRAVIS_TAG" ]]; then
Expand Down
18 changes: 18 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
Change Log
=============

0.18.0
+++++++

Changes
--------

* Session object de-allocation no longer calls session disconnect.
* Channel object de-allocation no longer calls channel close.
* Rebuilt sources with Cython ``0.29.6``.

Packaging
----------

* Source distribution builds would not include embedded libssh2 module in package - #51
* Removed OSX 10.10 binary wheel builds - deprecated by Travis-CI.
* Updated embedded OpenSSL version for Windows wheel builds.


0.17.0.post2
+++++++++++++

Expand Down
4 changes: 2 additions & 2 deletions ci/travis/build-manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

docker_tag="parallelssh/ssh2-manylinux"

rm -rf build dist
rm -rf build dist ssh2/libssh2.*

docker pull $docker_tag || echo
docker build --cache-from $docker_tag ci/docker/manylinux -t $docker_tag
docker push $docker_tag
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker push $docker_tag; fi
docker run --rm -v `pwd`:/io $docker_tag /io/ci/travis/build-wheels.sh
ls wheelhouse/
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ flake8
jinja2
sphinx
sphinx_rtd_theme
nose
pytest
104 changes: 71 additions & 33 deletions ssh2/agent.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading