Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ build:
parallel: true
verbosity: minimal
skip_branch_with_pr: true
image: Visual Studio 2019

environment:
global:
Expand All @@ -13,12 +14,11 @@ environment:
PYPI_PASS:
secure: uXkrTaPGSNQdXTJIt3aiy2E1GBnbn6gH3opi7DgMIcmpLgZt7RTeqsaszbjPToGkoqfVXN+jdkQca4LfGAKZ8a2LgrrVYoITdxbjNkZB3yDBKk6ULNMsqdHmt4I1evRhSPSSZnRKU2rSzL+gOTViEVnhcahsUJPgNAIFvpZWsZfdRAafFtF1D33B03aAPwuhYuZTIwRyhUrwVGsYzOzIoDLtnpGj/0+GHazwjhHXfg/yTd600SPiWVsgknxjoeBu+cmi2iMDeT3ULu3P8UGjuQ==
# Default python version to run single commands with
PYTHON_DEF: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_DEF: "C:\\Python38-x64"
PYTHON_VERSION: "3.8"
# Python versions to build wheels for
PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64
PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64
PYTHON_ARCH: "64"
MSVC: "Visual Studio 14 Win64"

install:
# If there is a newer build queued for the same PR, cancel this one.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ libssh/compile_commands.json
wheelhouse
.idea
tests/unit_test_cert_key-cert.pub
doc/_build
22 changes: 22 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
Change Log
=============

0.9.0
+++++

Changes
-------

* ``ssh.Channel.write`` and ``write_stderr`` now return return code and bytes written tuples.


Fixes
-----

* ``ssh.key.generate`` could not be used.
* Key types in ``ssh.keytypes`` were not initialised correctly.


Packaging
---------

* Added Windows Python 3.9 binary wheel.


0.8.0
+++++

Expand Down
5 changes: 2 additions & 3 deletions ci/appveyor/build_ssh.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)
mkdir src
cd src

set CMAKE_PLATFORM="%MSVC%"

cmake ..\libssh -G %CMAKE_PLATFORM% ^
cmake ..\libssh ^
-A x64 ^
-DCMAKE_BUILD_TYPE=Release ^
-DZLIB_LIBRARY=C:/zlib/lib/zlibstatic.lib ^
-DZLIB_INCLUDE_DIR=C:/zlib/include ^
Expand Down
18 changes: 5 additions & 13 deletions ci/appveyor/build_zlib.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,11 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)

mkdir zlib_build && cd zlib_build

IF "%MSVC%" == "Visual Studio 9" (
ECHO "Building without platform set"
cmake ..\zlib-1.2.11 -G "NMake Makefiles" ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
) ELSE (
ECHO "Building with platform %MSVC%"
cmake ..\zlib-1.2.11 ^
-G"%MSVC%" ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
cmake ..\zlib-1.2.11 ^
-A x64 ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
)

cmake --build . --config Release --target install
Expand Down
Loading