From 02f48f7a905973428fc7766cf92bb04614e1fdca Mon Sep 17 00:00:00 2001
From: yvesf <yvesf-git@xapek.org>
Date: Sun, 24 Jul 2011 13:12:14 +0200
Subject: cleanup, tag version 0.3

---
 setup.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 4a3e284..aa607ed 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,11 @@
 #!/usr/bin/env python
+import subprocess
+from setuptools import setup, find_packages
 
-version='0.2'
-try:
-    import pysvn
-    from pysvn import Client
-    import os
-    extra = Client().info(os.path.dirname(__file__)).revision.number
-    version = "%s-r%s" % (version,extra)
-except:
-    pass
 
-from setuptools import setup, find_packages
+version = subprocess.Popen(["git", "describe", "--tags", "--long"],stdout=subprocess.PIPE).communicate()[0].strip()
+assert len(version) > 3
+
 
 setup(
     name='ebus',
@@ -20,9 +15,10 @@ setup(
     author_email='ebus@xapek.org',
     url='http://xapek.org',
     scripts=[
-        "bin/ebus_dump".
-        "bin/ebus_app",
-        "bin/ebus_web",
+        "bin/ebus_dump.py",
+        "bin/ebus_app.py",
+        "bin/web_prod.py",
+        "bin/web_dev.py",
         ],
     packages=find_packages(),
     package_data={'doc':['*.txt'], 'xml':['*.xml']},
@@ -34,8 +30,9 @@ setup(
         "Intended Audience :: Developers",
         ],
     requires=[
-        "itty==0.6.7",
+        "bottle",
         "SQLAlchemy",
+        "psycopg2",
         ],
     )
 
-- 
cgit v1.2.1