MERGE PYTEST into PLOT to parametrize TCs.

Author: ankostis

.travis.yml

@@ -4,6 +4,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+
 addons:
   apt:
     packages:
@@ -13,13 +14,13 @@ addons:
 install:
   - pip install Sphinx sphinx_rtd_theme codecov packaging
   - "python -c $'import os, packaging.version as version\\nv = version.parse(os.environ.get(\"TRAVIS_TAG\", \"1.0\")).public\\nwith open(\"VERSION\", \"w\") as f: f.write(v)'"
-  - pip install .[plot]
+  - pip install -e .[test]
   - cd docs
   - make clean html
   - cd ..
 
 script:
-  - python setup.py nosetests --with-coverage --cover-package=graphkit
+  - pytest -v --cov=graphkit
 
 deploy:
   provider: pypi

setup.py

@@ -33,10 +33,12 @@
           "networkx == 2.2; python_version < '3.5'",
      ],
      extras_require={
-          'plot': ['pydot', 'matplotlib']
+          'plot': ['pydot', 'matplotlib'],
+          'test': ['pydot', 'matplotlib', 'pytest', "pytest-cov"],
      },
      tests_require=[
-          "numpy",
+          "pytest",
+          "pytest-cov",
           "ipython; python_version >= '3.5'",     # to test jupyter plot.
           "pydot",       # to test plot
           "matplotlib"   # to test plot

test/test_graphkit.py

@@ -11,7 +11,8 @@
 
 from pprint import pprint
 from operator import add
-from numpy.testing import assert_raises
+
+import pytest
 
 import graphkit.network as network
 import graphkit.modifiers as modifiers
@@ -261,9 +262,10 @@ def test_pruning_raises_for_bad_output():
 
     # Request two outputs we can compute and one we can't compute.  Assert
     # that this raises a ValueError.
-    assert_raises(ValueError, net, {'a': 1, 'b': 2, 'c': 3, 'd': 4},
-        outputs=['sum1', 'sum3', 'sum4'])
-
+    with pytest.raises(ValueError) as exinfo:
+        net({'a': 1, 'b': 2, 'c': 3, 'd': 4},
+            outputs=['sum1', 'sum3', 'sum4'])
+    assert exinfo.match('sum4')
 
 def test_optional():
     # Test that optional() needs work as expected.