Updated setup.py, ssh build script and associated files to build and set library run time path for embedded libssh. Removed unused file.

Pan · Pan · commit 0931e216ccf5 · 2018-06-28T11:34:58.000+01:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,3 +5,5 @@ exclude .travis.yml
 include LICENSE
 include ssh/*.pyx
 include ssh/*.pxd
+recursive-include libssh *
+include ci/build_ssh.sh
diff --git a/README.rst b/README.rst
@@ -1,25 +1,27 @@
 ssh-python
 ============
 
-Wrapper for libssh_ C library.
-
+Bindings for libssh_ C library.
 
 Installation
 _____________
 
 Currently only installation from source is provided. Binary wheels to follow.
 
-To install from source, run the following after cloning the repository
+To install from source, run the following:
 
 .. code-block:: shell
 
-   python setup.py install
+   pip install ssh-python
+
+
+Project is beta status.
 
 
 Prerequisites
 --------------
 
-* OpenSSL library and development headers
+* OpenSSL *or* gcrypt library and development headers
 * Optionally Zlib library and development headers for compression
 
 ``Libssh`` source code is embedded in this project and will be built when installation is triggered per above instructions. Versions of ``libssh`` other than the one embedded in this project are not supported.
@@ -71,8 +73,7 @@ _________
 The library uses `Cython`_ based native code extensions as wrappers to ``libssh``.
 
 * Thread safe - GIL is released as much as possible
-* Very low overhead
-* Super fast as a consequence of the excellent C library it uses and prodigious use of native code
+* Very low overhead thin wrapper
 * Object oriented - memory freed automatically and safely as objects are garbage collected by Python
 * Use Python semantics where applicable, such as context manager and iterator support for opening and reading from channels and SFTP file handles
 * Raise errors as Python exceptions
diff --git a/ci/build_ssh.sh b/ci/build_ssh.sh
@@ -8,3 +8,4 @@ mkdir -p src && cd src
 cmake -DCMAKE_BUILD_TYPE=Release ../libssh
 make -j6
 cd ..
+cp src/src/libssh.so.4 ssh/
diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@ def build_ssh():
         '--help' in sys.argv[1:] or
         sys.argv[1] in (
             '--help-commands', 'egg_info', '--version', 'clean',
-            '--long-description')) and
+            'sdist', '--long-description')) and
         __name__ == '__main__'):
     build_ssh()
 
@@ -73,13 +73,13 @@ def build_ssh():
         include_dirs=["libssh/include"],
         libraries=_libs,
         library_dirs=[_lib_dir],
-        runtime_library_dirs=[_lib_dir],
+        runtime_library_dirs=["$ORIGIN/."],
         extra_compile_args=_comp_args,
         **cython_args
     )
     for i in range(len(sources))]
 
-package_data = {'ssh': ['*.pxd']}
+package_data = {'ssh': ['*.pxd', 'libssh.so.4']}
 
 if ON_WINDOWS:
     package_data['ssh'].extend([
@@ -108,9 +108,11 @@ def build_ssh():
     include_package_data=True,
     platforms='any',
     classifiers=[
+        'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
+        'Programming Language :: C',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
@@ -119,9 +121,15 @@ def build_ssh():
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: System :: Shells',
+        'Topic :: System :: Networking',
+        'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Operating System :: POSIX',
         'Operating System :: POSIX :: Linux',
         'Operating System :: POSIX :: BSD',
+        'Operating System :: MacOS :: MacOS X',
     ],
     ext_modules=extensions,
     package_data=package_data,
diff --git a/ssh/ssh.pyx b/ssh/ssh.pyx
