Merge "Fix version to reside in setup.py"

diff --git a/aria/aria-rest-server/VERSION b/aria/aria-rest-server/VERSION
deleted file mode 100644 (file)
index 51f7e73..0000000
--- a/aria/aria-rest-server/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.1-SNAPSHOT

diff --git a/aria/aria-rest-server/setup.py b/aria/aria-rest-server/setup.py
index 799fe46..eca497c 100644 (file)
--- a/aria/aria-rest-server/setup.py
+++ b/aria/aria-rest-server/setup.py
@@ -19,15 +19,9 @@
 
 from setuptools import setup, find_packages
 
-try:
-  with open('VERSION') as v_file:
-    version = v_file.read().strip()
-except IOError:
-    print "There was a problem parsing the VERSION file."
-
 setup(
   name='aria-rest-server',
-  version=version,
+  version='0.1.0',
   packages=find_packages(),
   author = '',
   author_email = '',

diff --git a/aria/aria-rest-server/tox.ini b/aria/aria-rest-server/tox.ini
index e74b672..435de03 100644 (file)
--- a/aria/aria-rest-server/tox.ini
+++ b/aria/aria-rest-server/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35
+envlist = py27
 [testenv]
 deps=
   pytest