Merge branch 'develop' into precision-def

DistrictDataLabs · Jun 21, 2020 · a61605f · a61605f
2 parents d09a774 + a713f47
commit a61605f
Show file tree

Hide file tree

Showing 25 changed files with 265 additions and 469 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -38,7 +38,7 @@ environment:
 
         - PYTHON: "C:\\Miniconda36-x64"
           PYTHON_VERSION: "3.6"
-          MINICONDA_VERSION: "4.5.4"
+          MINICONDA_VERSION: "4.8.2"
           PYTHON_ARCH: "64"
 
         # Failing Tests Due to TypeError: LoadLibrary()

diff --git a/docs/api/features/manifold.rst b/docs/api/features/manifold.rst
@@ -163,7 +163,7 @@ The same functionality above can be achieved with the associated quick method ``
 
 .. code:: python
 
-    from yellowbrick.features.Manifold import manifold_embedding
+    from yellowbrick.features.manifold import manifold_embedding
     from yellowbrick.datasets import load_concrete
 
     # Load the regression dataset

diff --git a/setup.cfg b/setup.cfg
@@ -10,8 +10,7 @@ tests = True
 test=pytest
 
 [tool:pytest]
-# TODO: add --spec and --verbose back to addopts
-addopts = --cov=yellowbrick --flakes
+addopts = --verbose --cov=yellowbrick --flakes --spec
 python_files = tests/*
 flakes-ignore =
     __init__.py UnusedImport

diff --git a/tests/baseline_images/test_draw/test_manual_legend.png b/tests/baseline_images/test_draw/test_manual_legend.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank1d_horizontal.png b/tests/baseline_images/test_features/test_rankd/test_rank1d_horizontal.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank1d_orientation.png b/tests/baseline_images/test_features/test_rankd/test_rank1d_orientation.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank1d_shapiro.png b/tests/baseline_images/test_features/test_rankd/test_rank1d_shapiro.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank1d_vertical.png b/tests/baseline_images/test_features/test_rankd/test_rank1d_vertical.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank2d_covariance.png b/tests/baseline_images/test_features/test_rankd/test_rank2d_covariance.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank2d_kendalltau.png b/tests/baseline_images/test_features/test_rankd/test_rank2d_kendalltau.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank2d_pearson.png b/tests/baseline_images/test_features/test_rankd/test_rank2d_pearson.png
diff --git a/tests/baseline_images/test_features/test_rankd/test_rank2d_spearman.png b/tests/baseline_images/test_features/test_rankd/test_rank2d_spearman.png
diff --git a/tests/baseline_images/test_regressor/test_influence/test_cooks_distance.png b/tests/baseline_images/test_regressor/test_influence/test_cooks_distance.png
diff --git a/...seline_images/test_regressor/test_influence/test_cooks_distance_quickmethod.png b/...seline_images/test_regressor/test_influence/test_cooks_distance_quickmethod.png
diff --git a/tests/baseline_images/test_regressor/test_influence/test_numpy_integration.png b/tests/baseline_images/test_regressor/test_influence/test_numpy_integration.png
diff --git a/tests/baseline_images/test_regressor/test_influence/test_pandas_integration.png b/tests/baseline_images/test_regressor/test_influence/test_pandas_integration.png
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -6,15 +6,15 @@ numpy>=1.13.0
 cycler>=0.10.0
 
 # Testing Requirements
-pytest>=4.2.0, !=4.6.0
+pytest>=5.0.0
 pytest-cov>=2.6.1
 pytest-flakes>=4.0.0
-#pytest-spec>=1.1.0
+pytest-spec>=2.0.0
 coverage>=4.5.2
 
 # Optional Testing Dependencies
 nltk>=3.2
 # spacy>=2.0.18
-pandas>=0.20,<1
+pandas>=1.0.4
 umap-learn==0.3.9 # reminder to bump periodically!
 
diff --git a/tests/test_classifier/test_threshold.py b/tests/test_classifier/test_threshold.py
@@ -29,7 +29,7 @@
 
 from unittest.mock import patch
 from tests.base import VisualTestCase
-from numpy.testing.utils import assert_array_equal
+from numpy.testing import assert_array_equal
 
 from sklearn.base import ClassifierMixin
 from sklearn.svm import LinearSVC, NuSVC

diff --git a/tests/test_cluster/test_elbow.py b/tests/test_cluster/test_elbow.py
@@ -23,7 +23,7 @@
 import matplotlib.pyplot as plt
 
 from scipy.sparse import csc_matrix, csr_matrix
-from numpy.testing.utils import assert_array_almost_equal
+from numpy.testing import assert_array_almost_equal
 
 from sklearn.datasets import make_blobs
 from sklearn.cluster import KMeans, MiniBatchKMeans

diff --git a/tests/test_draw.py b/tests/test_draw.py
@@ -83,7 +83,7 @@ def test_manual_legend(self):
         )
 
         # Assert image similarity
-        self.assert_images_similar(ax=ax)
+        self.assert_images_similar(ax=ax, tol=0.5)
 
     def test_vertical_bar_stack(self):
         """