Merge branch 'develop' into debian-develop

diff --git a/devflow.conf b/devflow.conf
new file mode 100644 (file)
index 0000000..911ff20
--- /dev/null
+++ b/devflow.conf
@@ -0,0 +1,3 @@
+[ packages ]
+  [[ snf-pithos-webclient ]]
+    version_file = "snf-pithos-webclient/pithos_webclient/version.py"

diff --git a/snf-pithos-webclient/setup.py b/snf-pithos-webclient/setup.py
index f08248d..c1b622a 100644 (file)
--- a/snf-pithos-webclient/setup.py
+++ b/snf-pithos-webclient/setup.py
@@ -45,12 +45,6 @@ from setuptools import setup, find_packages
 
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
-try:
-    # try to update the version file
-    from synnefo.util import version
-    version.update_version('pithos_webclient', 'version', HERE)
-except ImportError:
-    pass
 
 from pithos_webclient.version import __version__
 

diff --git a/version b/version
new file mode 100644 (file)
index 0000000..b64234e
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.13next