Merge branch 'main' into imagestack_select

holoviz · Nov 16, 2024 · 1724e24 · 1724e24
2 parents 7233cc2 + c227510
commit 1724e24
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 35 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -127,14 +127,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [pip_build, waiting_room]
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    permissions:
+      id-token: write
     steps:
       - uses: actions/download-artifact@v4
         with:
           name: pip
           path: dist/
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: ${{ secrets.PPU }}
-          password: ${{ secrets.PPP }}
-          repository-url: "https://upload.pypi.org/legacy/"
diff --git a/.github/workflows/conventional_commits.yaml b/.github/workflows/conventional_commits.yaml
@@ -0,0 +1,43 @@
+name: "Validate PR title"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - reopened
+
+permissions:
+  pull-requests: read
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            build
+            chore
+            ci
+            compat
+            docs
+            enh
+            feat
+            fix
+            perf
+            refactor
+            test
+            type
+          scopes: |
+            data
+            plotting
+            bokeh
+            matplotlib
+            plotly
+          ignoreLabels: |
+            ignore-semantic-pull-request
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
diff --git a/doc/developer_guide/index.md b/doc/developer_guide/index.md
@@ -181,6 +181,35 @@ pixi run build-pip
 pixi run build-conda
 ```
 
+## Making a pull requests
+
+Once you have finished your code changes, you are ready to make a pull request.
+A pull request is how code from your local repository becomes available to maintainers to review
+and then merged into the project. To submit a pull request:
+
+1.  Navigate to your repository on GitHub.
+1.  Click on the `Compare & pull request` button.
+1.  You can then look at the commits and file changes to make sure everything looks
+    okay one last time.
+1.  Write a descriptive title that includes prefixes. HoloViews uses a convention for title
+    prefixes. The following prefixes are used:
+
+        * build: Changes that affect the build system
+        * chore: Changes that are not user-facing
+        * ci: Changes to CI configuration files and scripts
+        * compat: Compatibility with upstream packages
+        * docs: Documentation only changes
+        * enh: An enhancement to existing feature
+        * feat: A new feature
+        * fix: A bug fix
+        * perf: A code change that improves performance
+        * refactor: A code change that neither fixes a bug nor adds a feature
+        * test: Adding missing tests or correcting existing tests
+        * type: Type annotations
+
+1.  Write a description of your changes in the `Write` tab, and check if everything looks ok in the `Preview` tab.
+1.  Click `Create Pull Request`.
+
 ## Continuous Integration
 
 Every push to the `main` branch or any PR branch on GitHub automatically triggers a test build with [GitHub Actions](https://github.com/features/actions).

diff --git a/examples/gallery/demos/bokeh/choropleth_data_link.ipynb b/examples/gallery/demos/bokeh/choropleth_data_link.ipynb
@@ -42,11 +42,10 @@
     "            if county[\"state\"] == \"tx\"]\n",
     "\n",
     "\n",
-    "detailed_name = 'detailed_name' if counties[0].get('detailed_name') else 'detailed name' # detailed name was changed in Bokeh 3.0\n",
-    "county_data = [(county[detailed_name], county['Unemployment']) for county in counties]\n",
+    "county_data = [(county['detailed_name'], county['Unemployment']) for county in counties]\n",
     "\n",
-    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [(detailed_name, 'County'), 'Unemployment'], label='Texas Unemployment')\n",
-    "table = hv.Table(county_data, [(detailed_name, 'County'), 'Unemployment'])\n",
+    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [('detailed_name', 'County'), 'Unemployment'], label='Texas Unemployment')\n",
+    "table = hv.Table(county_data, [('detailed_name', 'County'), 'Unemployment'])\n",
     "\n",
     "print(len(choropleth.data), len(table))"
    ]

diff --git a/examples/gallery/demos/bokeh/texas_choropleth_example.ipynb b/examples/gallery/demos/bokeh/texas_choropleth_example.ipynb
@@ -42,8 +42,7 @@
     "            for cid, county in counties.items()\n",
     "            if county[\"state\"] == \"tx\"]\n",
     "\n",
-    "detailed_name = 'detailed_name' if counties[0].get('detailed_name') else 'detailed name' # detailed name was changed in Bokeh 3.0\n",
-    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [(detailed_name, 'County'), 'Unemployment'])"
+    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [('detailed_name', 'County'), 'Unemployment'])"
    ]
   },
   {

diff --git a/examples/gallery/demos/matplotlib/texas_choropleth_example.ipynb b/examples/gallery/demos/matplotlib/texas_choropleth_example.ipynb
@@ -44,8 +44,7 @@
     "            if county[\"state\"] == \"tx\"]\n",
     "\n",
     "\n",
-    "detailed_name = 'detailed_name' if counties[0].get('detailed_name') else 'detailed name' # detailed name was changed in Bokeh 3.0\n",
-    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [(detailed_name, 'County'), 'Unemployment'])"
+    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [('detailed_name', 'County'), 'Unemployment'])"
    ]
   },
   {

diff --git a/examples/user_guide/Linked_Brushing.ipynb b/examples/user_guide/Linked_Brushing.ipynb
@@ -275,16 +275,15 @@
     "            for cid, county in counties.items()\n",
     "            if county[\"state\"] == \"tx\"]\n",
     "\n",
-    "detailed_name = 'detailed_name' if counties[0].get('detailed_name') else 'detailed name' # detailed name was changed in Bokeh 3.0\n",
-    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [(detailed_name, 'County'), 'Unemployment'])\n",
+    "choropleth = hv.Polygons(counties, ['lons', 'lats'], [('detailed_name', 'County'), 'Unemployment'])\n",
     "hist = choropleth.hist('Unemployment', adjoin=False, normed=False)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To link the two we will specify the `'detailed name'` column as the `index_cols`."
+    "To link the two we will specify the `detailed_name` column as the `index_cols`."
    ]
   },
   {
@@ -293,7 +292,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "linked_choropleth = link_selections(choropleth + hist, index_cols=['detailed name'])"
+    "linked_choropleth = link_selections(choropleth + hist, index_cols=['detailed_name'])"
    ]
   },
   {

diff --git a/holoviews/core/data/__init__.py b/holoviews/core/data/__init__.py
@@ -4,7 +4,6 @@
 from functools import wraps
 
 import numpy as np
-import pandas as pd  # noqa
 import param
 from param.parameterized import ParameterizedMetaclass
 

diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
@@ -3068,7 +3068,7 @@ class OverlayPlot(GenericOverlayPlot, LegendPlot):
                           'min_height', 'max_height', 'min_width', 'min_height',
                           'margin', 'aspect', 'data_aspect', 'frame_width',
                           'frame_height', 'responsive', 'fontscale', 'subcoordinate_y',
-                          'subcoordinate_scale', 'autorange']
+                          'subcoordinate_scale', 'autorange', 'default_tools']
 
     def __init__(self, overlay, **kwargs):
         self._multi_y_propagation = self.lookup_options(overlay, 'plot').options.get('multi_y', False)

diff --git a/holoviews/tests/plotting/bokeh/test_elementplot.py b/holoviews/tests/plotting/bokeh/test_elementplot.py
@@ -1157,6 +1157,12 @@ def test_clim_percentile(self):
         assert low > 0
         assert high < 1
 
+    def test_propagate_tools(self):
+        scatter = lambda: Scatter([]).opts(default_tools=[])
+        overlay = scatter() * scatter()
+        plot = bokeh_renderer.get_plot(overlay)
+        assert plot.default_tools == []
+
 class TestApplyHardBounds(TestBokehPlot):
     def test_apply_hard_bounds(self):
         """Test `apply_hard_bounds` with a single element."""

diff --git a/pyproject.toml b/pyproject.toml
@@ -126,6 +126,8 @@ filterwarnings = [
     "ignore: Jitify is performing a one-time only warm::cupy", # OK,
     # 2024-10
     "ignore::ResourceWarning",
+    # 2024-11
+    "ignore:The legacy Dask DataFrame implementation is deprecated:FutureWarning", # https://github.com/holoviz/spatialpandas/issues/146
 ]
 
 [tool.coverage]