Skip to content

Commit ec56593

Browse files
author
Pan
committed
Added versioneer based versions - added setup.cfg and updated setup.py.
Updated embedded openssh server. Updated tests. Updated module names, examples, readme, package init.
1 parent 17aebb5 commit ec56593

File tree

11 files changed

+2374
-19
lines changed

11 files changed

+2374
-19
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ssh2/_version.py export-subst

MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
recursive-exclude embedded_server *
2+
include versioneer.py
3+
include ssh2/_version.py

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Clients using this library can be much simpler to use than interfacing with the
174174
import os
175175
import socket
176176
177-
from ssh2 import Session
177+
from ssh2.session import Session
178178
179179
host = 'localhost'
180180
user = os.getlogin()

embedded_server/openssh.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def _wait_for_port(self):
4141
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
4242
while sock.connect_ex(('127.0.0.1', self.port)) != 0:
4343
sleep(.1)
44+
sleep(.1)
4445
del sock
4546

4647
def stop(self):

examples/example_echo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import socket
44

5-
from ssh2 import Session
5+
from ssh2.session import Session
66
from ssh2.utils import version
77

88
# Connection settings

setup.cfg

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[versioneer]
2+
VCS = git
3+
style = pep440
4+
versionfile_source = ssh2/_version.py
5+
tag_prefix = ''
6+
7+
[bdist_wheel]
8+
universal = 0
9+
10+
[flake8]
11+
max-line-length = 80

setup.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from glob import glob
77
from multiprocessing import cpu_count
88

9-
# import versioneer
9+
import versioneer
1010
from setuptools import setup, find_packages, Extension
1111

1212
cpython = platform.python_implementation() == 'CPython'
@@ -55,16 +55,15 @@
5555

5656
setup(
5757
name='ssh2-python',
58-
# version=versioneer.get_version(),
59-
version='0.2.1',
58+
version=versioneer.get_version(),
59+
cmdclass=versioneer.get_cmdclass(),
6060
url='https://github.com/ParallelSSH/ssh2-python',
6161
license='LGPLv2',
6262
author='Panos Kittenis',
6363
author_email='22e889d8@opayq.com',
6464
description=('Python bindings for libssh2 based on Cython'),
6565
long_description=open('README.rst').read(),
66-
packages=find_packages(
67-
'.', exclude=('embedded_server', 'embedded_server.*')),
66+
packages=find_packages('.'),
6867
zip_safe=False,
6968
include_package_data=True,
7069
platforms='any',

ssh2/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
from .session import Session
1+
from ._version import get_versions
2+
__version__ = get_versions()['version']
3+
del get_versions

0 commit comments

Comments
 (0)