Moved tests and embedded server.

Updated setup.py and manifest to not include tests and embedded server.
ParallelSSH · Aug 28, 2017 · 6ee0997 · 6ee0997
1 parent 2e73a1a
commit 6ee0997
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,4 @@
-recursive-exclude embedded_server *
 recursive-exclude docker *
-recursive-exclude tests *
 include versioneer.py
 include ssh2/_version.py
 exclude .travis.yml

diff --git a/setup.py b/setup.py
@@ -40,8 +40,6 @@
     'cython_compile_time_env': {'EMBEDDED_LIB': _embedded_lib}} \
     if USING_CYTHON else {}
 
-print("Linking with %s and compiler arguments %s" % (_libs, _comp_args))
-
 extensions = [
     Extension(sources[i].split('.')[0].replace(os.path.sep, '.'),
               sources=[sources[i]],
@@ -69,7 +67,9 @@
     description=('Super fast SSH library - bindings for libssh2'),
     long_description=open('README.rst').read(),
     packages=find_packages(
-        '.', exclude=('embedded_server', 'embedded_server.*')),
+        '.', exclude=('embedded_server', 'embedded_server.*',
+                      'tests', 'tests.*',
+                      '*.tests', '*.tests.*')),
     zip_safe=False,
     include_package_data=True,
     platforms='any',

diff --git a/tests/base_test.py b/tests/base_test.py
@@ -4,8 +4,8 @@
 import socket
 from sys import version_info
 
+from .embedded_server.openssh import OpenSSHServer
 from ssh2.session import Session
-from embedded_server.openssh import OpenSSHServer
 
 
 PKEY_FILENAME = os.path.sep.join([os.path.dirname(__file__), 'unit_test_key'])

diff --git a/embedded_server/__init__.py → tests/embedded_server/__init__.py b/embedded_server/__init__.py → tests/embedded_server/__init__.py
diff --git a/embedded_server/authorized_keys → tests/embedded_server/authorized_keys b/embedded_server/authorized_keys → tests/embedded_server/authorized_keys
diff --git a/embedded_server/openssh.py → tests/embedded_server/openssh.py b/embedded_server/openssh.py → tests/embedded_server/openssh.py
diff --git a/embedded_server/rsa.key → tests/embedded_server/rsa.key b/embedded_server/rsa.key → tests/embedded_server/rsa.key
diff --git a/embedded_server/sshd_config.tmpl → tests/embedded_server/sshd_config.tmpl b/embedded_server/sshd_config.tmpl → tests/embedded_server/sshd_config.tmpl