Lint and add requirement for scikit-image

marthacryan · marthacryan · commit 36dabba13103 · 2024-10-31T13:55:39.000-05:00
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_any_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_any_validator.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 plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
 
 
 # Fixtures
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_boolean_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_boolean_validator.py
@@ -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 plotly.tests.test_optional.test_utils.test_utils import np_nan
 
 # Boolean Validator
 # =================
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_enumerated_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_enumerated_validator.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 plotly.tests.test_optional.test_utils.test_utils import np_inf
 
 # Fixtures
 # --------
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_integer_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_integer_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 plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
 
 # ### Fixtures ###
 @pytest.fixture()
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_number_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_number_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 plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
 
 # Fixtures
 # --------
@@ -143,7 +143,13 @@ def test_rejection_aok(val, validator_aok):
 # ### Rejection by element ###
 @pytest.mark.parametrize(
     "val",
-    [[-1.6, 0.0], [1, 1.5, 2], [-0.1234, 0.41, np_nan()], [0, np_inf()], [0, -np_inf()]],
+    [
+        [-1.6, 0.0],
+        [1, 1.5, 2],
+        [-0.1234, 0.41, np_nan()],
+        [0, np_inf()],
+        [0, -np_inf()],
+    ],
 )
 def test_rejection_aok_min_max(val, validator_aok):
     with pytest.raises(ValueError) as validation_failure:
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_string_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_string_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 plotly.tests.test_optional.test_utils.test_utils import np_nan
 
 
 # Fixtures
diff --git a/packages/python/plotly/_plotly_utils/tests/validators/test_subplotid_validator.py b/packages/python/plotly/_plotly_utils/tests/validators/test_subplotid_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 plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
 
 
 # Fixtures
diff --git a/packages/python/plotly/plotly/tests/test_optional/test_figure_factory/test_figure_factory.py b/packages/python/plotly/plotly/tests/test_optional/test_figure_factory/test_figure_factory.py
@@ -6,7 +6,7 @@
 
 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 plotly.tests.test_optional.test_utils.test_utils import np_nan, np_inf
 
 import numpy as np
 from plotly.tests.utils import TestCaseNoTemplate
diff --git a/packages/python/plotly/plotly/tests/test_optional/test_px/test_imshow.py b/packages/python/plotly/plotly/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 plotly.tests.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))
diff --git a/packages/python/plotly/plotly/tests/test_optional/test_px/test_trendline.py b/packages/python/plotly/plotly/tests/test_optional/test_px/test_trendline.py
@@ -3,7 +3,7 @@
 import pandas as pd
 import pytest
 from datetime import datetime
-from plotly.tests.test_optional.test_utils.test_utils import (np_nan)
+from plotly.tests.test_optional.test_utils.test_utils import np_nan
 
 
 @pytest.mark.parametrize(
diff --git a/packages/python/plotly/plotly/tests/test_optional/test_utils/test_utils.py b/packages/python/plotly/plotly/tests/test_optional/test_utils/test_utils.py
@@ -34,17 +34,19 @@
 
 
 def np_nan():
-    if Version(np.__version__) < Version('2.0.0'):
+    if Version(np.__version__) < Version("2.0.0"):
         return np.NaN
     else:
         return np.nan
-    
+
+
 def np_inf():
-    if Version(np.__version__) < Version('2.0.0'):
+    if Version(np.__version__) < Version("2.0.0"):
         return np.Inf
     else:
         return np.inf
 
+
 ## JSON encoding
 numeric_list = [1, 2, 3]
 np_list = np.array([1, 2, 3, np_nan(), np_inf(), dt(2014, 1, 5)])
@@ -250,7 +252,9 @@ def test_pandas_json_encoding(self):
         # Test that data wasn't mutated
         assert_series_equal(
             df["col 1"],
-            pd.Series([1, 2, 3, dt(2014, 1, 5), pd.NaT, np_nan(), np_inf()], name="col 1"),
+            pd.Series(
+                [1, 2, 3, dt(2014, 1, 5), pd.NaT, np_nan(), np_inf()], name="col 1"
+            ),
         )
 
         j2 = _json.dumps(df.index, cls=utils.PlotlyJSONEncoder)
diff --git a/packages/python/plotly/test_requirements/requirements_312_no_numpy_optional.txt b/packages/python/plotly/test_requirements/requirements_312_no_numpy_optional.txt
@@ -17,4 +17,5 @@ matplotlib==3.8.2
 scikit-image==0.22.0
 psutil==5.9.7
 kaleido
-orjson==3.9.10
+orjson==3.9.10
+scikit-image==0.24.0
