Move plotly_utils tests into root tests directory

Author: marthacryan

tests/test_core/test_graph_objs/test_append_trace.py

@@ -10,7 +10,7 @@
     XAxis,
     YAxis,
 )
-from plotly.tests.utils import strip_dict_params
+from ...utils import strip_dict_params
 
 import plotly.tools as tls
 

tests/test_core/test_graph_objs/test_figure.py

@@ -1,6 +1,6 @@
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
-from plotly.tests.utils import TestCaseNoTemplate
+from ...utils import TestCaseNoTemplate
 import pytest
 
 

tests/test_core/test_graph_objs/test_property_assignment.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 import plotly.graph_objs as go
 
-from plotly.tests.utils import strip_dict_params
+from ...utils import strip_dict_params
 
 
 class TestAssignmentPrimitive(TestCase):

tests/test_core/test_graph_objs/test_template.py

@@ -4,7 +4,7 @@
 
 import plotly.io as pio
 import plotly.graph_objs as go
-from plotly.tests.utils import TestCaseNoTemplate
+from ...utils import TestCaseNoTemplate
 
 
 class TemplateTest(TestCase):

tests/test_core/test_graph_objs/test_to_ordered_dict.py

@@ -1,6 +1,6 @@
 import plotly.graph_objs as go
 from collections import OrderedDict
-from plotly.tests.utils import TestCaseNoTemplate
+from ...utils import TestCaseNoTemplate
 
 
 class FigureTest(TestCaseNoTemplate):

tests/test_core/test_graph_objs/test_update.py

@@ -2,7 +2,7 @@
 
 import plotly.graph_objs as go
 from plotly.graph_objs import Data, Figure, Layout, Line, Scatter, scatter, XAxis
-from plotly.tests.utils import strip_dict_params
+from ...utils import strip_dict_params
 
 from unittest import TestCase
 

tests/test_core/test_optional_imports/test_optional_imports.py

@@ -24,7 +24,7 @@ def test_get_module_does_not_exist(self):
 
     def test_get_module_import_exception(self):
         # Get module that raises an exception on import
-        module_str = "plotly.tests.test_core." "test_optional_imports.exploding_module"
+        module_str = ".." "test_optional_imports.exploding_module"
 
         if sys.version_info >= (3, 4):
             with self.assertLogs("_plotly_utils.optional_imports", level="ERROR") as cm:

tests/test_optional/optional_utils.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from plotly import optional_imports
-from plotly.tests.utils import is_num_list
+from ..utils import is_num_list
 from plotly.utils import get_by_path, node_generator
 
 import copy

tests/test_optional/test_figure_factory/test_figure_factory.py

@@ -5,11 +5,11 @@
 import plotly.io as pio
 
 import plotly.figure_factory as ff
-from plotly.tests.test_optional.optional_utils import NumpyTestUtilsMixin
-from plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
+from ...test_optional.optional_utils import NumpyTestUtilsMixin
+from ...test_optional.test_utils.test_utils import np_nan, np_inf
 
 import numpy as np
-from plotly.tests.utils import TestCaseNoTemplate
+from ...utils import TestCaseNoTemplate
 from scipy.spatial import Delaunay
 import pandas as pd
 

tests/test_optional/test_graph_objs/test_skipped_b64_keys.py

@@ -1,7 +1,7 @@
 import json
 from unittest import TestCase
 import numpy as np
-from plotly.tests.test_optional.optional_utils import NumpyTestUtilsMixin
+from ...test_optional.optional_utils import NumpyTestUtilsMixin
 import plotly.graph_objs as go
 
 

tests/test_optional/test_matplotlylib/test_annotations.py

@@ -7,9 +7,9 @@
 if matplotlylib:
     import matplotlib.pyplot as plt
 
-    from plotly.tests.utils import compare_dict, strip_dict_params
-    from plotly.tests.test_optional.optional_utils import run_fig
-    from plotly.tests.test_optional.test_matplotlylib.data.annotations import *
+    from ...utils import compare_dict, strip_dict_params
+    from ..optional_utils import run_fig
+    from ..test_matplotlylib.data.annotations import *
 
 
 @pytest.mark.skip

tests/test_optional/test_matplotlylib/test_axis_scales.py

@@ -1,9 +1,9 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.utils import compare_dict, strip_dict_params
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.axis_scales import *
+from ...utils import compare_dict, strip_dict_params
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.axis_scales import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_matplotlylib/test_bars.py

@@ -1,9 +1,9 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.utils import compare_dict, strip_dict_params
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.bars import *
+from ...utils import compare_dict, strip_dict_params
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.bars import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_matplotlylib/test_data.py

@@ -1,8 +1,8 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.data import *
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.data import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_matplotlylib/test_lines.py

@@ -1,9 +1,9 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.utils import compare_dict, strip_dict_params
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.lines import *
+from ...utils import compare_dict, strip_dict_params
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.lines import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_matplotlylib/test_scatter.py

@@ -1,9 +1,9 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.utils import compare_dict, strip_dict_params
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.scatter import *
+from ...utils import compare_dict, strip_dict_params
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.scatter import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_matplotlylib/test_subplots.py

@@ -1,9 +1,9 @@
 import pytest
 
 from plotly import optional_imports
-from plotly.tests.utils import compare_dict, strip_dict_params
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.subplots import *
+from ...utils import compare_dict, strip_dict_params
+from ...test_optional.optional_utils import run_fig
+from ...test_optional.test_matplotlylib.data.subplots import *
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
 

tests/test_optional/test_px/test_imshow.py

@@ -7,7 +7,7 @@
 import base64
 import datetime
 from plotly.express.imshow_utils import rescale_intensity
-from plotly.tests.test_optional.test_utils.test_utils import np_nan
+from ...test_optional.test_utils.test_utils import np_nan
 
 img_rgb = np.array([[[255, 0, 0], [0, 255, 0], [0, 0, 255]]], dtype=np.uint8)
 img_gray = np.arange(100, dtype=float).reshape((10, 10))

tests/test_optional/test_px/test_trendline.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 from datetime import datetime
-from plotly.tests.test_optional.test_utils.test_utils import np_nan
+from ...test_optional.test_utils.test_utils import np_nan
 
 
 @pytest.mark.parametrize(

tests/test_optional/test_tools/test_figure_factory.py

@@ -6,9 +6,9 @@
 import plotly.io as pio
 
 from plotly.exceptions import PlotlyError
-from plotly.tests.test_optional.optional_utils import NumpyTestUtilsMixin
+from ...test_optional.optional_utils import NumpyTestUtilsMixin
 from plotly.graph_objs import graph_objs
-from plotly.tests.utils import TestCaseNoTemplate
+from ...utils import TestCaseNoTemplate
 
 
 class TestQuiver(TestCaseNoTemplate, NumpyTestUtilsMixin):

tests/test_orca/test_to_image.py

@@ -15,8 +15,8 @@
 
 # Constants
 # ---------
-project_root = os.path.dirname(os.path.realpath(plotly.__file__))
-images_root = os.path.join(project_root, "tests", "test_orca", "images")
+orca_test_root = os.path.dirname(os.path.abspath(__file__))
+images_root = os.path.join(orca_test_root, "images")
 print(images_root)
 if sys.platform.startswith("linux"):
     images_dir = os.path.join(images_root, "linux")

_plotly_utils/tests/__init__.py tests/test_plotly_utils/__init__.py

@@ -1,7 +1,7 @@
 import pytest
 from _plotly_utils.basevalidators import AnyValidator
 import numpy as np
-from plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
+from ...test_optional.test_utils.test_utils import np_nan, np_inf
 
 
 # Fixtures

_plotly_utils/tests/resources/1x1-black.png tests/test_plotly_utils/resources/1x1-black.png

@@ -1,6 +1,6 @@
 import pytest
 from _plotly_utils.basevalidators import BooleanValidator
-from plotly.tests.test_optional.test_utils.test_utils import np_nan
+from ...test_optional.test_utils.test_utils import np_nan
 
 # Boolean Validator
 # =================

_plotly_utils/tests/validators/__init__.py tests/test_plotly_utils/validators/__init__.py

@@ -2,7 +2,7 @@
 import numpy as np
 import pandas as pd
 from _plotly_utils.basevalidators import EnumeratedValidator
-from plotly.tests.test_optional.test_utils.test_utils import np_inf
+from ...test_optional.test_utils.test_utils import np_inf
 
 # Fixtures
 # --------

_plotly_utils/tests/validators/test_angle_validator.py tests/test_plotly_utils/validators/test_angle_validator.py

@@ -5,7 +5,7 @@
 from _plotly_utils.basevalidators import IntegerValidator
 import numpy as np
 import pandas as pd
-from plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
+from ...test_optional.test_utils.test_utils import np_nan, np_inf
 
 # ### Fixtures ###
 @pytest.fixture()

_plotly_utils/tests/validators/test_any_validator.py tests/test_plotly_utils/validators/test_any_validator.py

@@ -4,7 +4,7 @@
 from _plotly_utils.basevalidators import NumberValidator
 import numpy as np
 import pandas as pd
-from plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
+from ...test_optional.test_utils.test_utils import np_nan, np_inf
 
 # Fixtures
 # --------

_plotly_utils/tests/validators/test_basetraces_validator.py tests/test_plotly_utils/validators/test_basetraces_validator.py

@@ -2,7 +2,7 @@
 
 from _plotly_utils.basevalidators import StringValidator
 import numpy as np
-from plotly.tests.test_optional.test_utils.test_utils import np_nan
+from ...test_optional.test_utils.test_utils import np_nan
 
 
 # Fixtures

_plotly_utils/tests/validators/test_boolean_validator.py tests/test_plotly_utils/validators/test_boolean_validator.py

@@ -1,6 +1,6 @@
 import pytest
 from _plotly_utils.basevalidators import SubplotidValidator
-from plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
+from ...test_optional.test_utils.test_utils import np_nan, np_inf
 
 
 # Fixtures