Merge lp:~pedronis/u1db/setup-py into lp:u1db

[Samuele Pedroni]

basic work on setup.py to get setup.py install and setup.py sdist do something reasonable, including requiring deps under setuptools

[John A Meinel (jameinel)]

Do we have to list all the subdirectories explicitly?

review: Approve

[Samuele Pedroni (pedronis)]

setuptools has something called find_packages, but then the question is whether we want to include tests or not in a normal install. And whether we care to ignore the non setup tool case, or write a some fallback code. The number of packages is still small enough that I didn't want to bother.

=== modified file '.bzrignore'
--- .bzrignore	2011-10-12 13:25:28 +0000
+++ .bzrignore	2011-12-05 13:32:23 +0000
@@ -1,2 +1,4 @@
 ./build
+./dist
+./u1db.egg-info
 doc/sqlite_schema.html

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2011-12-05 13:32:23 +0000
@@ -0,0 +1,5 @@
+include COPYING
+include Makefile
+recursive-include doc *.txt
+# tests
+recursive-include u1db/tests *.py

=== modified file 'Makefile'
--- Makefile	2011-11-02 22:37:43 +0000
+++ Makefile	2011-12-05 13:32:23 +0000
@@ -1,5 +1,5 @@
 
-.PHONY: check
+.PHONY: check check-verbose
 
 check:
 	python -m testtools.run discover

=== modified file 'setup.py'
--- setup.py	2011-09-09 17:48:30 +0000
+++ setup.py	2011-12-05 13:32:23 +0000
@@ -23,9 +23,13 @@
         "url": "https://launchpad.net/u1db",
         "license": "GNU GPL v3",
         "download_url": "https://launchpad.net/u1db/+download",
-        "packages": ["u1db"],
-        "scripts": [],
+        "packages": ["u1db", "u1db.backends", "u1db.remote",
+                     "u1db.commandline", "u1db.compat"],
+        "scripts": ['u1db-client', 'u1db-serve'],
         "ext_modules": ext,
+        "install_requires": ["paste", "simplejson", "routes"],
+        # informational
+        "tests_require": ["testtools", "testscenarios"],
         "classifiers": [
             'Development Status :: 4 - Beta',
             'Environment :: Console',
@@ -46,7 +50,10 @@
 """
     }
 
-    from distutils.core import setup, Extension
+    try:
+        from setuptools import setup
+    except ImportError:
+        from distutils.core import setup
 
     setup(**kwargs)
 

=== modified file 'u1db-client' (properties changed: -x to +x)
=== modified file 'u1db-serve' (properties changed: -x to +x)