Skip to content

Commit

Permalink
Merge branch 'main' into core312
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxbro authored Dec 7, 2023
2 parents efdf9e0 + 91f841e commit 914c61e
Show file tree
Hide file tree
Showing 57 changed files with 633 additions and 488 deletions.
24 changes: 24 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
changelog:
categories:
- title: New features
labels:
- "type: feature"
- title: Enhancements
labels:
- "type: enhancement"
- title: Bug fixes
labels:
- "type: bug"
- title: Compatibility
labels:
- "type: compatibility"
- title: Documentation
labels:
- "type: doc"
- title: Maintenance
labels:
- "type: maintenance"
- title: Other Changes
labels:
- "*"
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
PANEL_EMBED_JSON: "true"
PANEL_EMBED_JSON_PREFIX: "json"
steps:
- uses: holoviz-dev/holoviz_tasks/install@v0.1a15
- uses: holoviz-dev/holoviz_tasks/install@v0.1a19
with:
name: Documentation
python-version: "3.10"
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: labels
on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]
jobs:
label:
name: Pull Request Labels
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: mheap/github-action-required-labels@v5
with:
mode: exactly
count: 1
labels: "type: bug, type: enhancement, type: feature, type: docs, type: maintenance, type: compatibility"
15 changes: 12 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ repos:
- id: check-json
- id: detect-private-key
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.2
rev: v0.1.6
hooks:
- id: ruff
args: [holoviews]
files: holoviews/
files: holoviews/|scripts/
- repo: https://github.com/hoxbro/clean_notebook
rev: v0.1.13
hooks:
Expand All @@ -35,3 +34,13 @@ repos:
- id: codespell
additional_dependencies:
- tomli
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
hooks:
- id: rst-backticks
- id: rst-directive-colons
- id: rst-inline-touching-normal
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.6
hooks:
- id: shellcheck
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
Version 1.18.1
==============
**November 8, 2023**


This release contains a small number of bug fixes and compatibility updates — many thanks to @philippjfr and @Hoxbro for their contributions.


Bug fixes:

- Account for overlaid elements when using `subcoordinates_y` ([#5950](https://github.com/holoviz/holoviews/pull/5950))
- Fix `groupby` option for vectorized annotations ([#5956](https://github.com/holoviz/holoviews/pull/5956))
- Fix and improvements to `ImageStack` ([#5961](https://github.com/holoviz/holoviews/pull/5961))
- Do not allow partial matches when updating `OverlayPlot` ([#5962](https://github.com/holoviz/holoviews/pull/5962))
- Always ravel array in `unique_array` ([#5969](https://github.com/holoviz/holoviews/pull/5969))

Compatibility:

- Update Stamen maps with new URL ([#5967](https://github.com/holoviz/holoviews/pull/5967))
- Compatibility updates for Numpy 2.0 ([#5979](https://github.com/holoviz/holoviews/pull/5979))

Maintenance:

- General maintenance ([#5955](https://github.com/holoviz/holoviews/pull/5955))


Version 1.18.0
==============
**October 18, 2023**
Expand Down
16 changes: 8 additions & 8 deletions doc/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ potential pitfalls we hope to help users avoid:
which for a Pandas dataframe will default to the name of that column.
If you want to define your own specific label to display for a
dimension, you can provide a tuple containing the column name and your
preferred label for it. For instance, if the column is named `x_col`,
preferred label for it. For instance, if the column is named ``x_col``,
you can make the label 'X Label' using:

.. code:: python
Expand All @@ -33,7 +33,7 @@ passing arguments (or an unpacked dictionary) to ``redim.label``:
curve = curve.redim.label(x_col='X Label', y_col='Label for Y')
To override a label for plotting it is also possible to use the
`xlabel` and `ylabel` plot options:
``xlabel`` and ``ylabel`` plot options:

.. code:: python
Expand All @@ -45,7 +45,7 @@ To override a label for plotting it is also possible to use the
**A:** Pass an unpacked dictionary containing the kdims/vdims' names
as keys and a tuple of the bounds as values into ``redim.range``.

This constrains the bounds of x_col to `(0, max(x_col))`.
This constrains the bounds of x_col to ``(0, max(x_col))``.

.. code:: python
Expand Down Expand Up @@ -74,13 +74,13 @@ across all objects that are presented together, so that they can be
compared directly. If you don't want objects that share a dimension to
be normalized together in your layout, you can change the ``axiswise``
normalization option to True, making each object be normalized
independently, e.g. for a layout of `Curve` objects use:
independently, e.g. for a layout of ``Curve`` objects use:

.. code:: python
your_layout.opts(opts.Curve(axiswise=True))
Alternatively you may also set `shared_axes=False` on the Layout itself:
Alternatively you may also set ``shared_axes=False`` on the Layout itself:

.. code:: python
Expand All @@ -96,7 +96,7 @@ normalized independently by changing ``framewise`` to True:
**Q: How do I make only a single axis be shared across a layout?**

**A:** Even when `shared_axes=True`, HoloViews will only share axes
**A:** Even when ``shared_axes=True``, HoloViews will only share axes
that have the same Dimension, so just make sure that axes that you
want to be independent have a different name or label. Here, the x
axis should be shared, but the y should be independent:
Expand All @@ -107,7 +107,7 @@ axis should be shared, but the y should be independent:
hv.Curve((xs, ys), 'x', 'y') + hv.Curve((xs, ys), 'x', 'z')
**Q: Why doesn't my DynamicMap respect the `framewise=False` option for axis normalization across frames?**
**Q: Why doesn't my DynamicMap respect the ``framewise=False`` option for axis normalization across frames?**

**A:** Unfortunately, HoloViews has no way of knowing the axis ranges
of objects that might be returned by future calls to a DynamicMap's
Expand Down Expand Up @@ -365,7 +365,7 @@ to the return value of that cell, if it's a HoloViews object. So, if you
want a given object to get customized, you need to make sure it is
returned from the cell, or the options won't ever be applied, and you
should only access it after it has been returned, or the options won't
*yet* have been applied. For instance, if you use `renderer.save()`
*yet* have been applied. For instance, if you use ``renderer.save()``
to export an object and only then return that object as the output of
a cell, the exported object won't have the options applied, because
they don't get applied until the object is returned
Expand Down
83 changes: 0 additions & 83 deletions doc/Homepage.ipynb

This file was deleted.

2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The `Getting-Started <getting_started>`_ guide explains the basic concepts and h

The `User Guide <user_guide>`_ goes more deeply into key concepts from HoloViews, when you are ready for further study.

The `API <reference_manual>`_ is the definitive guide to each HoloViews object, but the same information is available more conveniently via the `hv.help()` command and tab completion in the Jupyter notebook.
The `API <reference_manual>`_ is the definitive guide to each HoloViews object, but the same information is available more conveniently via the ``hv.help()`` command and tab completion in the Jupyter notebook.

If you have any `issues <https://github.com/holoviz/holoviews/issues>`_ or wish to `contribute code <https://help.github.com/articles/about-pull-requests>`_, you can visit our `GitHub site <https://github.com/holoviz/holoviews>`_ or file a topic on the `HoloViz Discourse <https://discourse.holoviz.org/>`_.

Expand Down
Loading

0 comments on commit 914c61e

Please sign in to comment.