Merge branch 'packaging' into debian-0.9

[pithos] / snf-pithos-backend / setup.py

diff --git a/snf-pithos-backend/setup.py b/snf-pithos-backend/setup.py
index f51c213..79134e7 100644 (file)
--- a/snf-pithos-backend/setup.py
+++ b/snf-pithos-backend/setup.py
@@ -40,11 +40,16 @@ import os
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
-from synnefo.util import version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-version.update_version('pithos.backends', 'version', HERE)
-from pithos.api.version import __version__
+try:
+    # try to update the version file
+    from synnefo.util import version
+    version.update_version('pithos.backends', 'version', HERE)
+except ImportError:
+    pass
+
+from pithos.backends.version import __version__
 
 # Package info
 VERSION = __version__
@@ -60,10 +65,9 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
-    'Django>=1.2.3',
+    'snf-common',
+    'snf-pithos-lib',
     'SQLAlchemy>=0.6.3',
-    'MySQL-python>=1.2.2',
-    'psycopg2>=2.2.1'
 ]
 
 EXTRAS_REQUIRES = {
@@ -185,7 +189,7 @@ setup(
     zip_safe = False,
 
     dependency_links = [
-        'http://docs.dev.grnet.gr/pypi/index.html'],
+        'http://docs.dev.grnet.gr/pypi/'],
 
     install_requires = INSTALL_REQUIRES,
     extras_require = EXTRAS_REQUIRES,