Skip to content

Commit 9791fff

Browse files
author
Pan
committed
Updated changelog.
Removed libssh2 submodule and runtime dependency in favour of bundle ssh2-python libssh2 library. Removed libssh2 scripts and dependencies. Updated manylinux scripts, removed custom image. Updated tests. Changed default forward ssh agent parameter to False. Detect and warn on lack of forward agent implementation in ssh2-python. Updated travis and appveyor cfgs. Updated native code to not use ssh2-python C-API, added docstrings. Resolves #144.
1 parent fa579cc commit 9791fff

23 files changed

+1591
-3661
lines changed

.appveyor.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ environment:
55
# See: http://stackoverflow.com/a/13751649/163740
66
CMD_IN_ENV: "cmd /E:ON /V:ON /C %APPVEYOR_BUILD_FOLDER%\\ci\\appveyor\\run_with_env.cmd"
77
PYTHONUNBUFFERED: 1
8-
OPENSSL_VER: 1.0.2o
98
PYPI_USER:
109
secure: 2m0jy6JD/R9RExIosOT6YA==
1110
PYPI_PASS:
@@ -96,18 +95,11 @@ install:
9695
- "python -m pip install -U pip"
9796
- "python -m pip install -U setuptools"
9897

99-
- git submodule update --init --recursive
100-
- 7z x ci\appveyor\zlib1211.zip
101-
- 7z x ci\appveyor\openssl-%OPENSSL_VER%-win%PYTHON_ARCH%.zip
102-
- cp ssleay32.dll pssh\native\
103-
- cp libeay32.dll pssh\native\
10498
- ps: ls pssh\native
10599
- "%CMD_IN_ENV% pip install -r requirements.txt"
106100
- "%CMD_IN_ENV% pip install -U wheel twine"
107101

108102
build_script:
109-
- "%CMD_IN_ENV% ci\\appveyor\\build_zlib.bat"
110-
- "%CMD_IN_ENV% ci\\appveyor\\build_ssh2.bat"
111103
- "%CMD_IN_ENV% python setup.py build_ext -i"
112104

113105
test_script:

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "libssh2"]
2-
path = libssh2
3-
url = https://github.com/ParallelSSH/libssh2.git

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ addons:
2323
before_install:
2424
- pip install -U pip setuptools
2525
install:
26-
- sudo ci/install-ssh2.sh
2726
- pip install -r requirements_dev.txt
2827
script:
2928
- export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu
@@ -58,8 +57,6 @@ jobs:
5857
- python2 -c "from __future__ import print_function; import ssl; from platform import python_version; print(ssl.OPENSSL_VERSION); print(python_version())"
5958
- sudo -H pip2 install twine
6059
- which twine
61-
- sudo ci/install-ssh2.sh
62-
- cp /usr/local/lib/libssh2* .
6360
- mkdir -p wheels
6461
install:
6562
- sudo -H pip2 install -U delocate wheel pip setuptools

Changelog.rst

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

4+
1.9.0
5+
++++++
6+
7+
Changes
8+
--------
9+
10+
* Removed libssh2 native library dependency in favour of bundled ssh2-python libssh2 library.
11+
* Changed native client forward agent default behaviour to off due to incompatibility with certain SSH server implementations.
12+
13+
414
1.8.2
515
++++++
616

ci/appveyor/build_ssh2.bat

Lines changed: 0 additions & 56 deletions
This file was deleted.

ci/appveyor/build_zlib.bat

Lines changed: 0 additions & 21 deletions
This file was deleted.

ci/appveyor/openssl-1.0.2o-win32.zip

-1.61 MB
Binary file not shown.

ci/appveyor/openssl-1.0.2o-win64.zip

-2.07 MB
Binary file not shown.

ci/appveyor/zlib1211.zip

-730 KB
Binary file not shown.

ci/docker/build-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ for x in `ls -1d ci/docker/{fedora,centos}*`; do
1010
dist="el${dist_num}"
1111
fi
1212
docker pull $docker_tag || echo
13-
docker build --cache-from $docker_tag $x -t $name
13+
docker build --pull --cache-from $docker_tag $x -t $name
1414
docker tag $name $docker_tag
1515
docker push $docker_tag
1616
sudo rm -rf build dist
@@ -26,7 +26,7 @@ for x in `ls -1d ci/docker/{debian,ubuntu}*`; do
2626
name=`echo "$x" | awk -F/ '{print $3}' | awk -F. '{print $1}'`
2727
docker_tag="parallelssh/parallel-ssh-pkgs:$name"
2828
docker pull $docker_tag || echo
29-
docker build --cache-from $docker_tag $x -t $name
29+
docker build --pull --cache-from $docker_tag $x -t $name
3030
docker tag $name $docker_tag
3131
docker push $docker_tag
3232
sudo rm -rf build dist

0 commit comments

Comments
 (0)