Merge branch 'master' into maplibre-tests

Author: LiamConnors

.circleci/config.yml

@@ -234,6 +234,21 @@ jobs:
       - test_optional:
           py: "39_pandas_2"
 
+  # No numpy
+  python_312_no_numpy:
+    docker:
+      - image: cimg/python:3.12-browsers
+    steps:
+      - run:
+          name: Check that numpy is not installed
+          command: |
+            if pip list | grep numpy > /dev/null 2>&1
+            then exit 1
+            else exit 0
+            fi
+      - test_optional:
+          py: "312_no_numpy"
+
   # Orca
   python_38_orca:
     docker:
@@ -448,7 +463,7 @@ jobs:
     docker:
       # specify the version you desire here
       # use `-browsers` prefix for selenium tests, for example, `3.9-browsers`
-      - image: cimg/python:3.10-browsers
+      - image: cimg/python:3.9-browsers
 
     steps:
       - add_ssh_keys:
@@ -598,5 +613,6 @@ workflows:
       - python_39_pandas_2_optional
       - python_38_orca
       - python_39_percy
+      - python_312_no_numpy
       - build-doc
 

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## UNRELEASED
+
+### Updated
+- Fixed a bug in integer validation of arrays that threw an error when an array contained a mix of strings and integers.
+
 ## [5.23.0] - 2024-07-23
 
 ### Updated

doc/python/axes.md

@@ -456,7 +456,7 @@ You can adjust tick label positions by moving them a number of pixels away from
 
 In this example, `ticklabelshift=25` shifts the labels 25 pixels to the right along the x-axis. By providing a negative value, we could move the labels 25 pixels to the left, (`ticklabelshift=-25`).
 
-Here, `ticklabelstandoff=15` moves the labels further 15 pixels away from the x-axis. A negative value here would move them close to the axis.
+Here, `ticklabelstandoff=15` moves the labels 15 pixels further away from the x-axis. A negative value here would move them closer to the axis.
 
 ```python
 import plotly.express as px
@@ -483,7 +483,7 @@ fig.show()
 
 On date or linear axes, use `ticklabelindex` to draw a label for a minor tick instead of a major tick.
 
-To draw the label for the minor tick before each major tick, set `ticklabelindex` -1, like in the following example.
+To draw the label for the minor tick before each major tick, set `ticklabelindex=-1`, like in the following example.
 
 ```python
 import plotly.express as px

doc/requirements.txt

@@ -4,21 +4,21 @@ ipywidgets==7.7.2
 jupyter-client<7
 jupyter
 notebook
-pandas==2.2.2
+pandas==1.4.0
 statsmodels==0.14.2
-scipy==1.13.0
+scipy==1.9.1
 patsy==0.5.6
-numpy==1.26.4
+numpy==1.22.4
 plotly-geo
 igraph
-geopandas==0.14.3
-pyshp==2.3.1
-shapely==2.0.4
+geopandas==0.8.1
+pyshp==2.1.2
+shapely==2.0.5
 psutil
 requests
-networkx==3.3
+networkx==2.8.0
 squarify
-scikit-image==0.23.2
+scikit-image==0.20.0
 scikit-learn
 sphinx==3.5.4
 sphinxcontrib-applehelp==1.0.2
@@ -31,7 +31,7 @@ sphinx_bootstrap_theme
 recommonmark
 pathlib
 python-frontmatter
-datashader==0.16.1
+datashader==0.14.4
 pyarrow
 cufflinks==0.17.3
 kaleido
@@ -42,6 +42,7 @@ nbconvert==5.6.1
 orjson
 dash-bio
 jinja2<3.1
-dask==2024.4.2
+dask==2022.2.0
 polars
+geoparse<=2.0.3
 xarray==2022.9.0

packages/python/plotly/_plotly_utils/basevalidators.py

@@ -950,7 +950,8 @@ def validate_coerce(self, v):
                 invalid_els = [
                     e
                     for e in v
-                    if not (self.min_val <= e <= self.max_val) and e not in self.extras
+                    if not (isinstance(e, int) and self.min_val <= e <= self.max_val)
+                    and e not in self.extras
                 ]
 
                 if invalid_els:

packages/python/plotly/_plotly_utils/tests/validators/test_integer_validator.py

@@ -33,6 +33,18 @@ def validator_aok(request):
     return IntegerValidator("prop", "parent", min=-2, max=10, array_ok=True)
 
 
+@pytest.fixture
+def validator_extras():
+    return IntegerValidator("prop", "parent", min=-2, max=10, extras=["normal", "bold"])
+
+
+@pytest.fixture
+def validator_extras_aok():
+    return IntegerValidator(
+        "prop", "parent", min=-2, max=10, array_ok=True, extras=["normal", "bold"]
+    )
+
+
 # ### Acceptance ###
 @pytest.mark.parametrize("val", [1, -19, 0, -1234])
 def test_acceptance(val, validator):
@@ -57,6 +69,27 @@ def test_acceptance_min_max(val, validator_min_max):
     assert validator_min_max.validate_coerce(val) == approx(val)
 
 
+# With extras
+@pytest.mark.parametrize("val", ["normal", "bold", 10, -2])
+def test_acceptance_extras(val, validator_extras):
+    assert validator_extras.validate_coerce(val) == val
+
+
+# Test extras for array_ok
+@pytest.mark.parametrize("val", [[10, "normal", "bold"], ["normal"], [10, -2], [5]])
+def test_acceptance_extras_array(val, validator_extras_aok):
+    assert validator_extras_aok.validate_coerce(val) == val
+
+
+# Test rejection by extras
+@pytest.mark.parametrize("val", ["invalid value", "different invalid value", -3, 11])
+def test_rejection_extras(val, validator_extras):
+    with pytest.raises(ValueError) as validation_failure:
+        validator_extras.validate_coerce(val)
+
+    assert "Invalid value" in str(validation_failure.value)
+
+
 @pytest.mark.parametrize(
     "val", [-1.01, -10, 2.1, 3, np.iinfo(int).max, np.iinfo(int).min]
 )

packages/python/plotly/test_requirements/requirements_312_no_numpy_optional.txt

@@ -0,0 +1,21 @@
+requests==2.31.0
+tenacity==8.2.3
+pandas
+xarray==2023.12.0
+statsmodels
+Pillow==10.2.0
+pytest==7.4.4
+pytz==2023.3.post1
+ipython[all]==7.22.0
+ipywidgets<8
+ipykernel==5.5.3
+jupyter==1.0.0
+scipy==1.11.4
+Shapely==2.0.2
+geopandas==0.14.2
+pyshp==2.3.1
+matplotlib==3.8.2
+scikit-image==0.22.0
+psutil==5.9.7
+kaleido
+orjson==3.9.10