Merge pull request #106 from curtacircuitos/ph-upgrade-requirements

Upgrade nose and coverage

.travis.yml

@@ -8,8 +8,7 @@ python:
 
 # command to install dependencies
 install:
-  - "pip install -r requirements.txt"
-  - "pip install -r test-requirements.txt"
+  - "pip install -r requirements-dev.txt"
   - "pip install coveralls"
 
 # command to run tests

README.md

@@ -48,11 +48,11 @@ Documentation:
 Development and Testing:
 ------------------------
 
-Dependencies for developing and testing pcb-tools are listed in test-requirements.txt. Use of a virtual environment is strongly recommended.
+Dependencies for developing and testing pcb-tools are listed in requirements-dev.txt. Use of a virtual environment is strongly recommended.
 
     $ virtualenv venv
     $ source venv/bin/activate
-    (venv)$ pip install -r test-requirements.txt
+    (venv)$ pip install -r requirements-dev.txt
     (venv)$ pip install -e .
 
 We use nose to run pcb-tools's suite of unittests and doctests.

doc-requirements.txt

@@ -1,4 +0,0 @@
-# Doc requirements
-Sphinx==1.2.3
-numpydoc==0.5
-

requirements-dev.txt

@@ -0,0 +1,5 @@
+# install base requirements
+-r requirements.txt
+
+coverage==4.5.4
+nose==1.3.7

requirements-docs.txt

@@ -0,0 +1,6 @@
+# install base requirements
+-r requirements.txt
+
+# documentation generation support
+Sphinx==1.2.3
+numpydoc==0.5

requirements.txt

@@ -1,2 +1,2 @@
-## The following requirements were added by pip --freeze:
+# cairo rendering support
 cairocffi==0.6

test-requirements.txt

@@ -1,4 +0,0 @@
-# Test requirements
-cairocffi==0.6
-coverage==3.7.1
-nose==1.3.4