Run tox

TaylorResearchLab · Mar 30, 2018 · 333c928 · 333c928
1 parent 2737c22
commit 333c928
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/scedar.sublime-project b/scedar.sublime-project
@@ -11,7 +11,7 @@
       "name": "PyTest",
       "working_dir": "${project_path}",
       "selector": "source.python",
-      "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl --mpl-baseline-path=tests/baseline_images --cov=scedar --ignore=tests/test_cluster/test_mirac_large_data.py\"",
+      "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl --mpl-baseline-path=tests/baseline_images --color=yes --cov-config .coveragerc --cov-branch --cov=scedar --ignore=tests/test_cluster/test_mirac_large_data.py\"",
       "env": {
          "TERM": "xterm-256color",
          "CLICOLOR_FORCE": "1",
@@ -24,12 +24,12 @@
 
         { 
           "name": "Generate Baseline Image",
-          "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl-generate-path=tests/baseline_images --cov=scedar --ignore=tests/test_cluster/test_mirac_large_data.py\"",
+          "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl-generate-path=tests/baseline_images --color=yes --cov-config .coveragerc --cov-branch --cov=scedar --ignore=tests/test_cluster/test_mirac_large_data.py\"",
         },
 
         { 
           "name": "Test All",
-          "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl --mpl-baseline-path=tests/baseline_images --cov=scedar\"",
+          "shell_cmd": "/Users/zhangy4/miniconda3/envs/py36/bin/python setup.py test --addopts \"--mpl --mpl-baseline-path=tests/baseline_images --color=yes --cov-config .coveragerc --cov-branch --cov=scedar\"",
         },
 
         {

diff --git a/scedar/eda/__init__.py b/scedar/eda/__init__.py
@@ -1,9 +1,9 @@
 __all__ = ["sfm", "sdm", "slcs", "plot", "mtype", "stats"]
 
+from .plot import (cluster_scatter, heatmap, regression_scatter,
+                   hist_dens_plot, networkx_graph)
 from .slcs import SingleLabelClassifiedSamples
 from .sfm import SampleFeatureMatrix
 from .sdm import SampleDistanceMatrix, tsne
-from .plot import (cluster_scatter, heatmap, regression_scatter, 
-                   hist_dens_plot, networkx_graph)
 from . import mtype
 from . import stats
diff --git a/setup.cfg b/setup.cfg
@@ -2,5 +2,4 @@
 test=pytest
 
 [tool:pytest]
-addopts = --verbose --color=yes --cov-config .coveragerc --cov-branch
-
+addopts = --verbose
diff --git a/tests/test_cluster/test_mdl.py b/tests/test_cluster/test_mdl.py
@@ -94,9 +94,7 @@ def test_kde_bw(self):
         zikm3 = cluster.ZeroIdcGKdeMdl(self.x, 1)
         xnz_std = zikm.x_nonzero.std(ddof=1)
         np.testing.assert_allclose(1, zikm3.bandwidth / xnz_std)
-        np.testing.assert_raises(AssertionError,
-                                 np.testing.assert_allclose,
-                                 zikm2.bandwidth, zikm3.bandwidth)
+        assert not np.allclose(zikm2.bandwidth, zikm3.bandwidth)
 
     def test_wrong_x_shape(self):
         with pytest.raises(ValueError) as excinfo: