From 09fcfca152e14734a49f1934d69279514194b093 Mon Sep 17 00:00:00 2001 From: Julien Iguchi-Cartigny Date: Thu, 3 Jul 2014 21:10:00 +0200 Subject: [PATCH] reordering directories to separate src from tests --- setup.py | 9 +-------- src/__init__.py | 0 src/wstools/tests/__init__.py | 1 - {src/wstools => tests}/.cvsignore | 0 {src/wstools/tests => tests}/README | 0 {src/wstools/tests => tests}/config.txt | 0 {src/wstools/tests => tests}/schema.tar.gz | Bin {src/wstools/tests => tests}/test_t1.py | 0 {src/wstools/tests => tests}/test_wsdl.py | 2 +- {src/wstools/tests => tests}/test_wstools.py | 0 {src/wstools/tests => tests}/test_wstools_net.py | 0 {src/wstools/tests => tests}/xmethods.tar.gz | Bin {src/wstools/tests => tests}/xmethods/ip2geo.wsdl | 0 {src/wstools/tests => tests}/xmethods/zip2geo.wsdl | 0 {src/wstools/tests => wstools}/.cvsignore | 0 {src/wstools => wstools}/MIMEAttachment.py | 0 {src/wstools => wstools}/Namespaces.py | 0 {src/wstools => wstools}/TimeoutSocket.py | 0 {src/wstools => wstools}/UserTuple.py | 0 {src/wstools => wstools}/Utility.py | 0 {src/wstools => wstools}/WSDLTools.py | 0 {src/wstools => wstools}/XMLSchema.py | 0 {src/wstools => wstools}/XMLname.py | 0 {src/wstools => wstools}/__init__.py | 0 {src/wstools => wstools}/c14n.py | 0 {src/wstools => wstools}/logging.py | 0 {src/wstools => wstools}/version.py | 0 27 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 src/__init__.py delete mode 100644 src/wstools/tests/__init__.py rename {src/wstools => tests}/.cvsignore (100%) rename {src/wstools/tests => tests}/README (100%) rename {src/wstools/tests => tests}/config.txt (100%) rename {src/wstools/tests => tests}/schema.tar.gz (100%) rename {src/wstools/tests => tests}/test_t1.py (100%) rename {src/wstools/tests => tests}/test_wsdl.py (98%) rename {src/wstools/tests => tests}/test_wstools.py (100%) rename {src/wstools/tests => tests}/test_wstools_net.py (100%) rename {src/wstools/tests => tests}/xmethods.tar.gz (100%) rename {src/wstools/tests => tests}/xmethods/ip2geo.wsdl (100%) rename {src/wstools/tests => tests}/xmethods/zip2geo.wsdl (100%) rename {src/wstools/tests => wstools}/.cvsignore (100%) rename {src/wstools => wstools}/MIMEAttachment.py (100%) rename {src/wstools => wstools}/Namespaces.py (100%) rename {src/wstools => wstools}/TimeoutSocket.py (100%) rename {src/wstools => wstools}/UserTuple.py (100%) rename {src/wstools => wstools}/Utility.py (100%) rename {src/wstools => wstools}/WSDLTools.py (100%) rename {src/wstools => wstools}/XMLSchema.py (100%) rename {src/wstools => wstools}/XMLname.py (100%) rename {src/wstools => wstools}/__init__.py (100%) rename {src/wstools => wstools}/c14n.py (100%) rename {src/wstools => wstools}/logging.py (100%) rename {src/wstools => wstools}/version.py (100%) diff --git a/setup.py b/setup.py index 6ed0914..ee5911b 100644 --- a/setup.py +++ b/setup.py @@ -16,16 +16,12 @@ long_description = """WSDL parsing services package for Web Services for Python. + read('README.txt')\ + read('CHANGES.txt')\ -from src.wstools.version import __version__ +from wstools.version import __version__ install_requires = [ 'docutils' ] -test_requires = [ - 'nose' -] - setup( name="wstools", version=__version__, @@ -35,8 +31,5 @@ setup( url=url, long_description=long_description, packages=['wstools'], - package_dir={'': 'src'}, - include_package_data=True, install_requires=install_requires, - tests_require=test_requires, ) diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/wstools/tests/__init__.py b/src/wstools/tests/__init__.py deleted file mode 100644 index ee3ecd2..0000000 --- a/src/wstools/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -#! /usr/bin/env python diff --git a/src/wstools/.cvsignore b/tests/.cvsignore similarity index 100% rename from src/wstools/.cvsignore rename to tests/.cvsignore diff --git a/src/wstools/tests/README b/tests/README similarity index 100% rename from src/wstools/tests/README rename to tests/README diff --git a/src/wstools/tests/config.txt b/tests/config.txt similarity index 100% rename from src/wstools/tests/config.txt rename to tests/config.txt diff --git a/src/wstools/tests/schema.tar.gz b/tests/schema.tar.gz similarity index 100% rename from src/wstools/tests/schema.tar.gz rename to tests/schema.tar.gz diff --git a/src/wstools/tests/test_t1.py b/tests/test_t1.py similarity index 100% rename from src/wstools/tests/test_t1.py rename to tests/test_t1.py diff --git a/src/wstools/tests/test_wsdl.py b/tests/test_wsdl.py similarity index 98% rename from src/wstools/tests/test_wsdl.py rename to tests/test_wsdl.py index d4a3a51..c15578a 100644 --- a/src/wstools/tests/test_wsdl.py +++ b/tests/test_wsdl.py @@ -70,7 +70,7 @@ class WSDLToolsTestCase(unittest.TestCase): if self.path[:7] == 'http://': self.wsdl = WSDLReader().loadFromURL(self.path) else: - self.wsdl = WSDLReader().loadFromFile('src/wstools/tests/' + self.path) + self.wsdl = WSDLReader().loadFromFile('tests/' + self.path) except TimeoutError: print "connection timed out" diff --git a/src/wstools/tests/test_wstools.py b/tests/test_wstools.py similarity index 100% rename from src/wstools/tests/test_wstools.py rename to tests/test_wstools.py diff --git a/src/wstools/tests/test_wstools_net.py b/tests/test_wstools_net.py similarity index 100% rename from src/wstools/tests/test_wstools_net.py rename to tests/test_wstools_net.py diff --git a/src/wstools/tests/xmethods.tar.gz b/tests/xmethods.tar.gz similarity index 100% rename from src/wstools/tests/xmethods.tar.gz rename to tests/xmethods.tar.gz diff --git a/src/wstools/tests/xmethods/ip2geo.wsdl b/tests/xmethods/ip2geo.wsdl similarity index 100% rename from src/wstools/tests/xmethods/ip2geo.wsdl rename to tests/xmethods/ip2geo.wsdl diff --git a/src/wstools/tests/xmethods/zip2geo.wsdl b/tests/xmethods/zip2geo.wsdl similarity index 100% rename from src/wstools/tests/xmethods/zip2geo.wsdl rename to tests/xmethods/zip2geo.wsdl diff --git a/src/wstools/tests/.cvsignore b/wstools/.cvsignore similarity index 100% rename from src/wstools/tests/.cvsignore rename to wstools/.cvsignore diff --git a/src/wstools/MIMEAttachment.py b/wstools/MIMEAttachment.py similarity index 100% rename from src/wstools/MIMEAttachment.py rename to wstools/MIMEAttachment.py diff --git a/src/wstools/Namespaces.py b/wstools/Namespaces.py similarity index 100% rename from src/wstools/Namespaces.py rename to wstools/Namespaces.py diff --git a/src/wstools/TimeoutSocket.py b/wstools/TimeoutSocket.py similarity index 100% rename from src/wstools/TimeoutSocket.py rename to wstools/TimeoutSocket.py diff --git a/src/wstools/UserTuple.py b/wstools/UserTuple.py similarity index 100% rename from src/wstools/UserTuple.py rename to wstools/UserTuple.py diff --git a/src/wstools/Utility.py b/wstools/Utility.py similarity index 100% rename from src/wstools/Utility.py rename to wstools/Utility.py diff --git a/src/wstools/WSDLTools.py b/wstools/WSDLTools.py similarity index 100% rename from src/wstools/WSDLTools.py rename to wstools/WSDLTools.py diff --git a/src/wstools/XMLSchema.py b/wstools/XMLSchema.py similarity index 100% rename from src/wstools/XMLSchema.py rename to wstools/XMLSchema.py diff --git a/src/wstools/XMLname.py b/wstools/XMLname.py similarity index 100% rename from src/wstools/XMLname.py rename to wstools/XMLname.py diff --git a/src/wstools/__init__.py b/wstools/__init__.py similarity index 100% rename from src/wstools/__init__.py rename to wstools/__init__.py diff --git a/src/wstools/c14n.py b/wstools/c14n.py similarity index 100% rename from src/wstools/c14n.py rename to wstools/c14n.py diff --git a/src/wstools/logging.py b/wstools/logging.py similarity index 100% rename from src/wstools/logging.py rename to wstools/logging.py diff --git a/src/wstools/version.py b/wstools/version.py similarity index 100% rename from src/wstools/version.py rename to wstools/version.py