Switch to pytest

holoviz · May 25, 2021 · bed9c02 · bed9c02
1 parent 434595b
commit bed9c02
Show file tree

Hide file tree

Showing 71 changed files with 11 additions and 18 deletions.
diff --git a/...ews/tests/core/data/testarrayinterface.py → ...ws/tests/core/data/test_arrayinterface.py b/...ews/tests/core/data/testarrayinterface.py → ...ws/tests/core/data/test_arrayinterface.py
diff --git a/...ews/tests/core/data/testbinneddatasets.py → ...ws/tests/core/data/test_binneddatasets.py b/...ews/tests/core/data/testbinneddatasets.py → ...ws/tests/core/data/test_binneddatasets.py
diff --git a/...iews/tests/core/data/testcudfinterface.py → ...ews/tests/core/data/test_cudfinterface.py b/...iews/tests/core/data/testcudfinterface.py → ...ews/tests/core/data/test_cudfinterface.py
diff --git a/...iews/tests/core/data/testdaskinterface.py → ...ews/tests/core/data/test_daskinterface.py b/...iews/tests/core/data/testdaskinterface.py → ...ews/tests/core/data/test_daskinterface.py
@@ -11,7 +11,7 @@
 from holoviews.core.data import Dataset
 from holoviews.util.transform import dim
 
-from .testpandasinterface import BasePandasInterfaceTests
+from .test_pandasinterface import BasePandasInterfaceTests
 
 
 class DaskDatasetTest(BasePandasInterfaceTests):

diff --git a/...iews/tests/core/data/testdictinterface.py → ...ews/tests/core/data/test_dictinterface.py b/...iews/tests/core/data/testdictinterface.py → ...ews/tests/core/data/test_dictinterface.py
diff --git a/...iews/tests/core/data/testgridinterface.py → ...ews/tests/core/data/test_gridinterface.py b/...iews/tests/core/data/testgridinterface.py → ...ews/tests/core/data/test_gridinterface.py
@@ -21,7 +21,7 @@
 from .base import (
     GriddedInterfaceTests, InterfaceTests, HomogeneousColumnTests, DatatypeContext
 )
-from .testimageinterface import (
+from .test_imageinterface import (
     BaseImageElementInterfaceTests, BaseRGBElementInterfaceTests,
     BaseHSVElementInterfaceTests
 )

diff --git a/...iews/tests/core/data/testibisinterface.py → ...ews/tests/core/data/test_ibisinterface.py b/...iews/tests/core/data/testibisinterface.py → ...ews/tests/core/data/test_ibisinterface.py
diff --git a/...ews/tests/core/data/testimageinterface.py → ...ws/tests/core/data/test_imageinterface.py b/...ews/tests/core/data/testimageinterface.py → ...ws/tests/core/data/test_imageinterface.py
diff --git a/...ews/tests/core/data/testmultiinterface.py → ...ws/tests/core/data/test_multiinterface.py b/...ews/tests/core/data/testmultiinterface.py → ...ws/tests/core/data/test_multiinterface.py
diff --git a/...ws/tests/core/data/testpandasinterface.py → ...s/tests/core/data/test_pandasinterface.py b/...ws/tests/core/data/testpandasinterface.py → ...s/tests/core/data/test_pandasinterface.py
diff --git a/...iews/tests/core/data/testspatialpandas.py → ...ews/tests/core/data/test_spatialpandas.py b/...iews/tests/core/data/testspatialpandas.py → ...ews/tests/core/data/test_spatialpandas.py
@@ -26,7 +26,7 @@
 from holoviews.element import Path, Points, Polygons
 from holoviews.element.comparison import ComparisonTestCase
 
-from .testmultiinterface import GeomTests
+from .test_multiinterface import GeomTests
 
 
 class RoundTripTests(ComparisonTestCase):

diff --git a/...ws/tests/core/data/testxarrayinterface.py → ...s/tests/core/data/test_xarrayinterface.py b/...ws/tests/core/data/testxarrayinterface.py → ...s/tests/core/data/test_xarrayinterface.py
@@ -16,11 +16,11 @@
 from holoviews.core.spaces import HoloMap
 from holoviews.element import Image, RGB, HSV, QuadMesh
 
-from .testimageinterface import (
+from .test_imageinterface import (
     BaseImageElementInterfaceTests, BaseRGBElementInterfaceTests,
     BaseHSVElementInterfaceTests
 )
-from .testgridinterface import BaseGridInterfaceTests
+from .test_gridinterface import BaseGridInterfaceTests
 
 
 class XArrayInterfaceTests(BaseGridInterfaceTests):

diff --git a/holoviews/tests/core/testapply.py → holoviews/tests/core/test_apply.py b/holoviews/tests/core/testapply.py → holoviews/tests/core/test_apply.py
diff --git a/holoviews/tests/core/testarchives.py → holoviews/tests/core/test_archives.py b/holoviews/tests/core/testarchives.py → holoviews/tests/core/test_archives.py
diff --git a/holoviews/tests/core/testboundingregion.py → holoviews/tests/core/test_boundingregion.py b/holoviews/tests/core/testboundingregion.py → holoviews/tests/core/test_boundingregion.py
diff --git a/holoviews/tests/core/testcallable.py → holoviews/tests/core/test_callable.py b/holoviews/tests/core/testcallable.py → holoviews/tests/core/test_callable.py
diff --git a/holoviews/tests/core/testcollation.py → holoviews/tests/core/test_collation.py b/holoviews/tests/core/testcollation.py → holoviews/tests/core/test_collation.py
diff --git a/holoviews/tests/core/testcomposites.py → holoviews/tests/core/test_composites.py b/holoviews/tests/core/testcomposites.py → holoviews/tests/core/test_composites.py
diff --git a/holoviews/tests/core/testdatasetproperty.py → holoviews/tests/core/test_datasetproperty.py b/holoviews/tests/core/testdatasetproperty.py → holoviews/tests/core/test_datasetproperty.py
diff --git a/holoviews/tests/core/testdecollation.py → holoviews/tests/core/test_decollation.py b/holoviews/tests/core/testdecollation.py → holoviews/tests/core/test_decollation.py
diff --git a/holoviews/tests/core/testdimensioned.py → holoviews/tests/core/test_dimensioned.py b/holoviews/tests/core/testdimensioned.py → holoviews/tests/core/test_dimensioned.py
diff --git a/holoviews/tests/core/testdimensions.py → holoviews/tests/core/test_dimensions.py b/holoviews/tests/core/testdimensions.py → holoviews/tests/core/test_dimensions.py
diff --git a/holoviews/tests/core/testdynamic.py → holoviews/tests/core/test_dynamic.py b/holoviews/tests/core/testdynamic.py → holoviews/tests/core/test_dynamic.py
@@ -17,7 +17,7 @@
 from holoviews.element.comparison import ComparisonTestCase
 
 from ..utils import LoggingComparisonTestCase
-from .testdimensioned import CustomBackendTestCase, TestObj
+from .test_dimensioned import CustomBackendTestCase, TestObj
 
 XY = Stream.define('XY', x=0,y=0)
 X = Stream.define('X', x=0)

diff --git a/holoviews/tests/core/testelement.py → holoviews/tests/core/test_element.py b/holoviews/tests/core/testelement.py → holoviews/tests/core/test_element.py
diff --git a/holoviews/tests/core/testimportexport.py → holoviews/tests/core/test_importexport.py b/holoviews/tests/core/testimportexport.py → holoviews/tests/core/test_importexport.py
diff --git a/holoviews/tests/core/testlayers.py → holoviews/tests/core/test_layers.py b/holoviews/tests/core/testlayers.py → holoviews/tests/core/test_layers.py
diff --git a/holoviews/tests/core/testlayouts.py → holoviews/tests/core/test_layouts.py b/holoviews/tests/core/testlayouts.py → holoviews/tests/core/test_layouts.py
diff --git a/holoviews/tests/core/testndmapping.py → holoviews/tests/core/test_ndmapping.py b/holoviews/tests/core/testndmapping.py → holoviews/tests/core/test_ndmapping.py
diff --git a/holoviews/tests/core/testoperation.py → holoviews/tests/core/test_operation.py b/holoviews/tests/core/testoperation.py → holoviews/tests/core/test_operation.py
diff --git a/holoviews/tests/core/testoptions.py → holoviews/tests/core/test_options.py b/holoviews/tests/core/testoptions.py → holoviews/tests/core/test_options.py
diff --git a/holoviews/tests/core/testprettyprint.py → holoviews/tests/core/test_prettyprint.py b/holoviews/tests/core/testprettyprint.py → holoviews/tests/core/test_prettyprint.py
@@ -7,7 +7,7 @@
 from holoviews import Store, Element, Curve, Overlay, Layout
 from holoviews.core.pprint import PrettyPrinter
 
-from .testdimensioned import CustomBackendTestCase, TestObj
+from .test_dimensioned import CustomBackendTestCase, TestObj
 
 
 class PrettyPrintTest(ComparisonTestCase):

diff --git a/holoviews/tests/core/teststoreoptions.py → holoviews/tests/core/test_storeoptions.py b/holoviews/tests/core/teststoreoptions.py → holoviews/tests/core/test_storeoptions.py
diff --git a/holoviews/tests/core/testtraversal.py → holoviews/tests/core/test_traversal.py b/holoviews/tests/core/testtraversal.py → holoviews/tests/core/test_traversal.py
diff --git a/holoviews/tests/core/testtree.py → holoviews/tests/core/test_tree.py b/holoviews/tests/core/testtree.py → holoviews/tests/core/test_tree.py
diff --git a/holoviews/tests/core/testutils.py → holoviews/tests/core/test_utils.py b/holoviews/tests/core/testutils.py → holoviews/tests/core/test_utils.py
diff --git a/holoviews/tests/element/testannotations.py → holoviews/tests/element/test_annotations.py b/holoviews/tests/element/testannotations.py → holoviews/tests/element/test_annotations.py
diff --git a/...views/tests/element/testapiconsistency.py → ...iews/tests/element/test_apiconsistency.py b/...views/tests/element/testapiconsistency.py → ...iews/tests/element/test_apiconsistency.py
diff --git a/...iews/tests/element/testcomparisonchart.py → ...ews/tests/element/test_comparisonchart.py b/...iews/tests/element/testcomparisonchart.py → ...ews/tests/element/test_comparisonchart.py
diff --git a/.../tests/element/testcomparisoncomposite.py → ...tests/element/test_comparisoncomposite.py b/.../tests/element/testcomparisoncomposite.py → ...tests/element/test_comparisoncomposite.py
diff --git a/.../tests/element/testcomparisondimension.py → ...tests/element/test_comparisondimension.py b/.../tests/element/testcomparisondimension.py → ...tests/element/test_comparisondimension.py
diff --git a/...views/tests/element/testcomparisonpath.py → ...iews/tests/element/test_comparisonpath.py b/...views/tests/element/testcomparisonpath.py → ...iews/tests/element/test_comparisonpath.py
diff --git a/...ews/tests/element/testcomparisonraster.py → ...ws/tests/element/test_comparisonraster.py b/...ews/tests/element/testcomparisonraster.py → ...ws/tests/element/test_comparisonraster.py
diff --git a/...ews/tests/element/testcomparisonsimple.py → ...ws/tests/element/test_comparisonsimple.py b/...ews/tests/element/testcomparisonsimple.py → ...ws/tests/element/test_comparisonsimple.py
diff --git a/.../tests/element/testelementconstructors.py → ...tests/element/test_elementconstructors.py b/.../tests/element/testelementconstructors.py → ...tests/element/test_elementconstructors.py
diff --git a/holoviews/tests/element/testelementranges.py → ...views/tests/element/test_elementranges.py b/holoviews/tests/element/testelementranges.py → ...views/tests/element/test_elementranges.py
diff --git a/holoviews/tests/element/testelementselect.py → ...views/tests/element/test_elementselect.py b/holoviews/tests/element/testelementselect.py → ...views/tests/element/test_elementselect.py
diff --git a/holoviews/tests/element/testellipsis.py → holoviews/tests/element/test_ellipsis.py b/holoviews/tests/element/testellipsis.py → holoviews/tests/element/test_ellipsis.py
diff --git a/holoviews/tests/element/testgraphelement.py → holoviews/tests/element/test_graphelement.py b/holoviews/tests/element/testgraphelement.py → holoviews/tests/element/test_graphelement.py
diff --git a/holoviews/tests/element/testimage.py → holoviews/tests/element/test_image.py b/holoviews/tests/element/testimage.py → holoviews/tests/element/test_image.py
diff --git a/holoviews/tests/element/testpaths.py → holoviews/tests/element/test_paths.py b/holoviews/tests/element/testpaths.py → holoviews/tests/element/test_paths.py
diff --git a/holoviews/tests/element/testraster.py → holoviews/tests/element/test_raster.py b/holoviews/tests/element/testraster.py → holoviews/tests/element/test_raster.py
diff --git a/holoviews/tests/element/teststatselements.py → ...views/tests/element/test_statselements.py b/holoviews/tests/element/teststatselements.py → ...views/tests/element/test_statselements.py
diff --git a/holoviews/tests/element/testtiles.py → holoviews/tests/element/test_tiles.py b/holoviews/tests/element/testtiles.py → holoviews/tests/element/test_tiles.py
diff --git a/holoviews/tests/ipython/testdisplayhooks.py → holoviews/tests/ipython/test_displayhooks.py b/holoviews/tests/ipython/testdisplayhooks.py → holoviews/tests/ipython/test_displayhooks.py
diff --git a/holoviews/tests/ipython/testmagics.py → holoviews/tests/ipython/test_magics.py b/holoviews/tests/ipython/testmagics.py → holoviews/tests/ipython/test_magics.py
diff --git a/holoviews/tests/ipython/testnotebooks.py → holoviews/tests/ipython/test_notebooks.py b/holoviews/tests/ipython/testnotebooks.py → holoviews/tests/ipython/test_notebooks.py
diff --git a/holoviews/tests/ipython/testoptscompleter.py → ...views/tests/ipython/test_optscompleter.py b/holoviews/tests/ipython/testoptscompleter.py → ...views/tests/ipython/test_optscompleter.py
diff --git a/holoviews/tests/ipython/testparsers.py → holoviews/tests/ipython/test_parsers.py b/holoviews/tests/ipython/testparsers.py → holoviews/tests/ipython/test_parsers.py
diff --git a/holoviews/tests/operation/testdatashader.py → holoviews/tests/operation/test_datashader.py b/holoviews/tests/operation/testdatashader.py → holoviews/tests/operation/test_datashader.py
diff --git a/holoviews/tests/operation/testoperation.py → holoviews/tests/operation/test_operation.py b/holoviews/tests/operation/testoperation.py → holoviews/tests/operation/test_operation.py
diff --git a/...ws/tests/operation/teststatsoperations.py → ...s/tests/operation/test_statsoperations.py b/...ws/tests/operation/teststatsoperations.py → ...s/tests/operation/test_statsoperations.py
diff --git a/...sts/operation/testtimeseriesoperations.py → ...ts/operation/test_timeseriesoperations.py b/...sts/operation/testtimeseriesoperations.py → ...ts/operation/test_timeseriesoperations.py
diff --git a/holoviews/tests/plotting/testcomms.py → holoviews/tests/plotting/test_comms.py b/holoviews/tests/plotting/testcomms.py → holoviews/tests/plotting/test_comms.py
diff --git a/holoviews/tests/plotting/testplotutils.py → holoviews/tests/plotting/test_plotutils.py b/holoviews/tests/plotting/testplotutils.py → holoviews/tests/plotting/test_plotutils.py
diff --git a/holoviews/tests/plotting/testrenderclass.py → holoviews/tests/plotting/test_renderclass.py b/holoviews/tests/plotting/testrenderclass.py → holoviews/tests/plotting/test_renderclass.py
diff --git a/holoviews/tests/testselection.py → holoviews/tests/test_selection.py b/holoviews/tests/testselection.py → holoviews/tests/test_selection.py
diff --git a/holoviews/tests/teststreams.py → holoviews/tests/test_streams.py b/holoviews/tests/teststreams.py → holoviews/tests/test_streams.py
diff --git a/holoviews/tests/util/testtransform.py → holoviews/tests/util/test_transform.py b/holoviews/tests/util/testtransform.py → holoviews/tests/util/test_transform.py
diff --git a/holoviews/tests/util/testutils.py → holoviews/tests/util/test_utils.py b/holoviews/tests/util/testutils.py → holoviews/tests/util/test_utils.py
diff --git a/setup.py b/setup.py
@@ -64,7 +64,8 @@
 
 # Test requirements
 extras_require['tests'] = [
-    'nose',
+    'pytest',
+    'pytest-cov',
     'mock',
     'flake8',
     'coveralls',

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@
 
 [tox]
 #          python version             test group                  extra envs  extra commands
-envlist = {py36,py37,py38}-{flakes,unit,examples,all_recommended,regression}-{default}-{dev,pkg}
+envlist = {py36,py37,py38}-{flakes,unit,examples,all_recommended}-{default}-{dev,pkg}
 
 [_flakes]
 description = Flake check python
@@ -13,13 +13,7 @@ commands = flake8 holoviews
 [_unit]
 description = Run unit tests with coverage
 deps = .[unit_tests]
-passenv = TRAVIS TRAVIS_*
-commands = nosetests holoviews.tests --with-doctest --with-coverage --cover-package=holoviews
-
-[_regression]
-description = Run regression tests
-deps = .[nbtests]
-commands = python ./test_notebooks.py
+commands = pytest panel --cov=./panel
 
 [_examples]
 description = Test that default examples run
@@ -45,14 +39,12 @@ changedir = {envtmpdir}
 commands = examples-pkg: {[_pkg]commands}
            unit: {[_unit]commands}
            flakes: {[_flakes]commands}
-		   regression: {[_regression]commands}
            examples: {[_examples]commands}
            all_recommended: {[_all_recommended]commands}
 
 deps = unit: {[_unit]deps}
        flakes: {[_flakes]deps}
        all_recommended: {[_all_recommended]deps}
-       regression: {[_regression]deps}
 
 [flake8]
 include = *.py