Skip to content

Commit 11df964

Browse files
authored
Updated changelog, readme, rtd configuration (#32)
* Updated changelog, readme, rtd configuration * Updated setup.py, key C file * Updated manylinux scripts, docker file, krb archive and openssl version. * Updated manylinux binary wheel openssl to 1.1 * Lfs track xz * Updated embedded openssh test server
1 parent 69d4a51 commit 11df964

16 files changed

+275
-285
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.tar.gz filter=lfs diff=lfs merge=lfs -text
22
*.rpm filter=lfs diff=lfs merge=lfs -text
33
*.zip filter=lfs diff=lfs merge=lfs -text
4+
*.xz filter=lfs diff=lfs merge=lfs -text

Changelog.rst

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

4+
0.8.0
5+
+++++
6+
7+
Changes
8+
--------
9+
10+
* Updated supported key types in ``ssh.keytypes`` for libssh 0.9.5.
11+
* Added certificate import and handling functions to ``ssh.key``
12+
13+
Packaging
14+
---------
15+
16+
* Updated OpenSSL in manylinux wheels to 1.1
17+
* Added Python 3.9 Windows 64-bit binary wheel
18+
419
0.7.0
520
+++++
621

README.rst

+9-39
Original file line numberDiff line numberDiff line change
@@ -27,57 +27,27 @@ _____________
2727

2828
Binary wheels are provided for Linux (manylinux 2010), OSX (10.14 and 10.15 for brew Python), and Windows 64-bit (Python 3.6/3.7/3.8).
2929

30-
Wheels have *no dependencies*. For building from source, see `documentation <http://ssh-python.readthedocs.org/en/latest/>`_.
30+
Wheels have *no dependencies*.
31+
32+
For building from source, see `documentation <https://ssh-python.readthedocs.io/en/latest/installation.html#building-from-source>`_.
3133

3234

3335
.. code-block:: shell
3436
3537
pip install ssh-python
3638
39+
Pip may need to be updated to be able to install binary wheels.
3740

38-
Project is beta status, please report any issues.
41+
.. code-block:: shell
42+
43+
pip install -U pip
44+
pip install ssh-python
3945
4046
4147
Quick Start
4248
_____________
4349

44-
45-
.. code-block:: python
46-
47-
from __future__ import print_function
48-
49-
import os
50-
import pwd
51-
52-
from ssh.session import Session
53-
from ssh import options
54-
55-
# Linux only
56-
USERNAME = pwd.getpwuid(os.geteuid()).pw_name
57-
HOST = 'localhost'
58-
59-
s = Session()
60-
s.options_set(options.HOST, HOST)
61-
s.connect()
62-
63-
# Authenticate with agent
64-
s.userauth_agent(USERNAME)
65-
66-
chan = s.channel_new()
67-
chan.open_session()
68-
chan.request_exec('echo me')
69-
size, data = chan.read()
70-
while size > 0:
71-
print(data.strip())
72-
size, data = chan.read()
73-
chan.close()
74-
75-
Output:
76-
77-
.. code-block:: shell
78-
79-
me
80-
50+
See `command execution script <https://github.com/ParallelSSH/ssh-python/blob/master/examples/exec.py>`_ for complete example.
8151

8252
Features
8353
_________

ci/travis/build-manylinux.sh ci/build-manylinux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
docker_tag="parallelssh/ssh-manylinux"
44

5-
rm -rf build ssh/libssh.*
5+
rm -rf local build ssh/libssh.* ssh/*.so
66
python ci/appveyor/fix_version.py .
77

88
docker pull $docker_tag || echo
99
docker build --pull --cache-from $docker_tag ci/docker/manylinux -t $docker_tag
1010
if [[ -z "$CIRCLE_PULL_REQUEST" ]]; then docker push $docker_tag; fi
11-
docker run --rm -v `pwd`:/io $docker_tag /io/ci/travis/build-wheels.sh
11+
docker run --rm -v `pwd`:/io $docker_tag /io/ci/build-wheels.sh
1212
ls wheelhouse/
File renamed without changes.

ci/docker/manylinux/Dockerfile

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
FROM quay.io/pypa/manylinux2010_x86_64
22

3-
ENV OPENSSL openssl-1.0.2p
3+
ENV OPENSSL openssl-1.1.1g
44
ENV LIBSSH 0.9.5
55
ENV SYSTEM_LIBSSH 1
66

77
RUN yum install zlib-devel cmake3 -y
88

99
ADD libssh-${LIBSSH}.tar.xz libssh.tar.xz
10-
ADD ${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
11-
ADD krb5-1.18.2.tar.gz krb5-1.18.2.tar.gz
10+
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
11+
ADD krb5-1.18.2.tar.xz krb5-1.18.2.tar.xz
1212

13+
RUN tar -xzf ${OPENSSL}.tar.gz
1314
# Openssl
14-
RUN cd ${OPENSSL}.tar.gz/${OPENSSL} && \
15+
RUN cd ${OPENSSL} && \
1516
./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
1617
make -j6 && make install
1718

1819
# Kerberos
19-
RUN cd krb5-1.18.2.tar.gz/krb5-1.18.2/src && \
20+
RUN cd krb5-1.18.2.tar.xz/krb5-1.18.2/src && \
2021
./configure && \
2122
make -j6 && \
2223
make install
@@ -27,8 +28,6 @@ RUN mkdir -p build_libssh && cd build_libssh && \
2728
-DWITH_GSS_API=ON && \
2829
make -j6 install
2930

30-
31-
RUN rm -rf ${OPENSSL}* libssh build_libssh krb5-1.18.2.tar.gz
32-
31+
RUN rm -rf ${OPENSSL}* libssh build_libssh krb5-1.18.2.tar.xz
3332

3433
VOLUME /var/cache

ci/docker/manylinux/krb5-1.18.2.tar.gz

-3
This file was deleted.
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:5edbf866236e0b0ec9e8ab67593f8824ea88666c4190d2d2746519fb71691377
3+
size 6268820
-491 KB
Binary file not shown.

ci/docker/manylinux/openssl-1.0.2p.tar.gz

-3
This file was deleted.

ci/docker/manylinux/openssl-1.0.2p.tar.gz.sha256

-1
This file was deleted.

doc/conf.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#
1313
# import os
1414
# import sys
15-
# sys.path.insert(0, os.path.abspath('.'))
1615

1716
import ssh
1817

@@ -51,7 +50,7 @@
5150
# The theme to use for HTML and HTML Help pages. See the documentation for
5251
# a list of builtin themes.
5352
#
54-
html_theme = 'alabaster'
53+
html_theme = 'sphinx_rtd_theme'
5554

5655
# Add any paths that contain custom static files (such as style sheets) here,
5756
# relative to this directory. They are copied after the builtin static files,
@@ -93,7 +92,11 @@
9392
# further. For a list of options available for each theme, see the
9493
# documentation.
9594
#
96-
# html_theme_options = {}
95+
html_theme_options = {
96+
'navigation_depth': 2,
97+
'collapse_navigation': False,
98+
'display_version': True,
99+
}
97100

98101
# Add any paths that contain custom static files (such as style sheets) here,
99102
# relative to this directory. They are copied after the builtin static files,

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
'boundscheck': False,
5454
'optimize.use_switch': True,
5555
'wraparound': False,
56+
'language_level': 2,
5657
}
5758
cython_args = {
5859
'cython_directives': cython_directives,

0 commit comments

Comments
 (0)