Move subvertpy into package directory.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 2 Oct 2008 20:22:45 +0000 (22:22 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 2 Oct 2008 20:22:45 +0000 (22:22 +0200)
23 files changed:
setup.py
subvertpy/__init__.py [moved from __init__.py with 100% similarity]
subvertpy/client.c [moved from client.c with 100% similarity]
subvertpy/delta.py [moved from delta.py with 100% similarity]
subvertpy/editor.c [moved from editor.c with 100% similarity]
subvertpy/editor.h [moved from editor.h with 100% similarity]
subvertpy/properties.py [moved from properties.py with 100% similarity]
subvertpy/ra.c [moved from ra.c with 100% similarity]
subvertpy/ra.h [moved from ra.h with 100% similarity]
subvertpy/repos.c [moved from repos.c with 100% similarity]
subvertpy/stdbool.h [moved from stdbool.h with 100% similarity]
subvertpy/tests/__init__.py [moved from tests/__init__.py with 100% similarity]
subvertpy/tests/test_client.py [moved from tests/test_client.py with 100% similarity]
subvertpy/tests/test_core.py [moved from tests/test_core.py with 91% similarity]
subvertpy/tests/test_delta.py [moved from tests/test_delta.py with 100% similarity]
subvertpy/tests/test_properties.py [moved from tests/test_properties.py with 100% similarity]
subvertpy/tests/test_ra.py [moved from tests/test_ra.py with 100% similarity]
subvertpy/tests/test_repos.py [moved from tests/test_repos.py with 100% similarity]
subvertpy/tests/test_wc.py [moved from tests/test_wc.py with 100% similarity]
subvertpy/util.c [moved from util.c with 100% similarity]
subvertpy/util.h [moved from util.h with 100% similarity]
subvertpy/wc.c [moved from wc.c with 100% similarity]
subvertpy/wc.h [moved from wc.h with 100% similarity]

index 3b44aa6..f041853 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -242,7 +242,7 @@ def SvnExtension(name, *args, **kwargs):
             if "define_macros" not in kwargs:
                 kwargs["define_macros"] = []
             kwargs["define_macros"].extend((('DARWIN', None), ('SVN_KEYCHAIN_PROVIDER_AVAILABLE', '1')))
-    return Extension("bzrlib.plugins.svn.subvertpy.%s" % name, *args, **kwargs)
+    return Extension("subvertpy.%s" % name, *args, **kwargs)
 
 
 # On Windows, we install the apr binaries too.
@@ -290,7 +290,7 @@ class install_lib_with_dlls(install_lib):
 
 def source_path(filename):
     source_code_dir = os.path.dirname(__file__)
-    return os.path.join(source_code_dir, filename)
+    return os.path.join(source_code_dir, "subvertpy", filename)
 
 
 subvertpy_modules = [ 
@@ -315,7 +315,6 @@ if __name__ == "__main__":
           Alternative Python bindings for Subversion, split out from bzr-svn. The goal is to have complete, portable and "Pythonic" Python bindings. 
           """,
           packages=['subvertpy', 'subvertpy.tests'],
-          package_dir={"subvertpy":"."},
           ext_modules=subvertpy_modules,
           cmdclass = { 'install_lib': install_lib_with_dlls },
           )
similarity index 100%
rename from __init__.py
rename to subvertpy/__init__.py
similarity index 100%
rename from client.c
rename to subvertpy/client.c
similarity index 100%
rename from delta.py
rename to subvertpy/delta.py
similarity index 100%
rename from editor.c
rename to subvertpy/editor.c
similarity index 100%
rename from editor.h
rename to subvertpy/editor.h
similarity index 100%
rename from properties.py
rename to subvertpy/properties.py
similarity index 100%
rename from ra.c
rename to subvertpy/ra.c
similarity index 100%
rename from ra.h
rename to subvertpy/ra.h
similarity index 100%
rename from repos.c
rename to subvertpy/repos.c
similarity index 100%
rename from stdbool.h
rename to subvertpy/stdbool.h
similarity index 91%
rename from tests/test_core.py
rename to subvertpy/tests/test_core.py
index 9b4e74b..16a50c8 100644 (file)
@@ -23,4 +23,4 @@ class TestCore(TestCase):
         super(TestCore, self).setUp()
 
     def test_exc(self):
-        self.assertIsInstance(subvertpy.SubversionException("foo", 1), Exception)
+        self.assertTrue(isinstance(subvertpy.SubversionException("foo", 1), Exception))
similarity index 100%
rename from tests/test_ra.py
rename to subvertpy/tests/test_ra.py
similarity index 100%
rename from tests/test_wc.py
rename to subvertpy/tests/test_wc.py
similarity index 100%
rename from util.c
rename to subvertpy/util.c
similarity index 100%
rename from util.h
rename to subvertpy/util.h
similarity index 100%
rename from wc.c
rename to subvertpy/wc.c
similarity index 100%
rename from wc.h
rename to subvertpy/wc.h