Update .travis.yml and setup files

.travis.yml

@@ -6,10 +6,12 @@ python:
   - "3.4"
 
 install:
-  - python setup.py install
-
-before_script:
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' || $TRAVIS_PYTHON_VERSION = '3.4' ]]; then export VOLT_TEST_DIR=build/lib/volt/test; else export VOLT_TEST_DIR=volt/test; fi"
+  - pip install coveralls --use-wheel
+  - pip install .
+  - pip install -r dev-requirements.txt
 
 script:
-  - nosetests $VOLT_TEST_DIR
+  - py.test --cov-report term --cov volt tests/
+
+after_success:
+  - coveralls

dev-requirements.txt

@@ -1,14 +1,4 @@
-coverage
-mock
-nose
-docutils
-textile
-markdown
-pygments
-
-#setup.py develop
--e .
-
-# optional dev dependencies
-# Sphinx
-# tox
+pytest==2.6.4
+pytest-cov==1.8.1
+mock==1.0.1
+testfixtures==4.1.1

requirements.txt

@@ -0,0 +1,3 @@
+future==0.14.3
+Jinja2==2.7.3
+Markdown==2.4.1

setup.py

@@ -28,12 +28,14 @@ def run_tests(self):
         sys.exit(errno)
 
 
-install_requires = [
-    "future==0.14.3",
-    "Jinja2==2.7.3",
-    "Markdown==2.4.1",
-]
-long_description = open("README.rst").read()
+with open('README.rst') as src:
+    long_description = src.read()
+
+with open('requirements.txt') as src:
+    install_requires = [line.strip() for line in src]
+
+with open('dev-requirements.txt') as src:
+    tests_require = [line.strip() for line in src]
 
 # handle dependencies for python2.x (x < 7)
 try:
@@ -59,12 +61,7 @@ def run_tests(self):
         "textile": ["textile==2.1.5"],
         "syntax highlight": ["pygments==1.5"],
     },
-    tests_require = [
-        'pytest==2.6.4',
-        'pytest-cov==1.8.1',
-        'mock==1.0.1',
-        'testfixtures==4.1.1',
-    ],
+    tests_require = tests_require,
     cmdclass = {'test': PyTest},
     zip_safe = False,
     entry_points = """