Skip to content

Commit 9f514e4

Browse files
committed
Merge branch 'main' into pre-commit-ci-update-config
2 parents 170934c + 1bf109f commit 9f514e4

34 files changed

Lines changed: 339 additions & 134 deletions

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.3.2
2+
current_version = 0.4.0
33
commit = True
44
commit_args = -s
55
message = Release version {new_version}

.github/workflows/check-release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 1
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Default MISSING_CHANGELOG_ENTRY to 1
2828
run: echo 'MISSING_CHANGELOG_ENTRY=1' >> "$GITHUB_ENV"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 6
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- uses: ./.github/actions/setup-python
2727
with:
2828
python-version: "3.9"
@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ${{ matrix.os }}
6767
timeout-minutes: 8
6868
steps:
69-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
7070
with:
7171
# TODO: This can be very expensive for large repos. Is there a better way to do this?
7272
# Fetch all history and tags for setuptools_scm to work

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# actions: read
3030
# contents: read
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333

3434
- uses: github/codeql-action/init@v3
3535
with:

.github/workflows/greet-new-users.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 1
1313
steps:
14-
- uses: actions/first-interaction@v1
14+
- uses: actions/first-interaction@v3
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
1717
issue-message: |

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
timeout-minutes: 6
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
3737
# TODO: This can be very expensive for large repos. Is there a better way to do this?
3838
# Fetch all history and tags for setuptools_scm to work
@@ -61,7 +61,7 @@ jobs:
6161
permissions:
6262
id-token: write # IMPORTANT: mandatory for trusted publishing
6363
steps:
64-
- uses: actions/download-artifact@v4
64+
- uses: actions/download-artifact@v5
6565
with:
6666
name: python-package-distributions
6767
path: dist/
@@ -84,7 +84,7 @@ jobs:
8484
permissions:
8585
id-token: write # IMPORTANT: mandatory for trusted publishing
8686
steps:
87-
- uses: actions/download-artifact@v4
87+
- uses: actions/download-artifact@v5
8888
with:
8989
name: python-package-distributions
9090
path: dist/
@@ -105,7 +105,7 @@ jobs:
105105
steps:
106106

107107
# Generate the release notes
108-
- uses: actions/checkout@v4
108+
- uses: actions/checkout@v5
109109
with:
110110
# TODO: This can be very expensive for large repos. Is there a better way to do this?
111111
# Fetch all history and tags for setuptools_scm to work
@@ -119,12 +119,12 @@ jobs:
119119

120120
# Sign the package distributions with Sigstore
121121
# https://github.com/marketplace/actions/gh-action-sigstore-python
122-
- uses: actions/download-artifact@v4
122+
- uses: actions/download-artifact@v5
123123
with:
124124
name: python-package-distributions
125125
path: dist/
126126
- name: Sign the dists with Sigstore
127-
uses: sigstore/gh-action-sigstore-python@v3.0.0
127+
uses: sigstore/gh-action-sigstore-python@v3.0.1
128128
with:
129129
inputs: >-
130130
./dist/*.tar.gz

.pre-commit-config.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_language_version:
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v5.0.0
6+
rev: v6.0.0
77
hooks:
88
- id: check-added-large-files
99
args: [ '--maxkb=500' ]
@@ -43,7 +43,7 @@ repos:
4343
exclude: ^\.bumpversion\.cfg$
4444

4545
- repo: https://github.com/python-jsonschema/check-jsonschema.git
46-
rev: 0.32.1
46+
rev: 0.33.3
4747
hooks:
4848
- id: check-github-actions
4949
- id: check-github-workflows
@@ -72,9 +72,11 @@ repos:
7272
exclude: ^docs/_static/.*\.(js|html)$|^src/ridgeplot/.*\.c$
7373

7474
- repo: https://github.com/shellcheck-py/shellcheck-py
75-
rev: v0.10.0.1
75+
rev: v0.11.0.1
7676
hooks:
7777
- id: shellcheck
78+
# Exclude zsh scripts (unsupported by shellcheck)
79+
exclude: ^cicd_utils/find-unmentioned-prs\.sh$
7880

7981
# mdformat is not enabled by default, but can be run manually with:
8082
# pre-commit run mdformat --all-files --hook-stage manual
@@ -102,7 +104,7 @@ repos:
102104
additional_dependencies: [setuptools-scm]
103105

104106
- repo: https://github.com/astral-sh/ruff-pre-commit
105-
rev: v0.11.2
107+
rev: v0.12.10
106108
hooks:
107109
- id: ruff-format
108110
- id: ruff

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ prune docs/api/public
3333

3434
# Misc
3535
recursive-include .github *.yml *.yaml
36-
recursive-include cicd_utils README.md *.py
36+
recursive-include cicd_utils README.md *.py *.sh
3737
recursive-include misc *.py *.ipynb *.txt *.png
3838
recursive-include requirements *.txt
3939
recursive-include tests *.py

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ samples = [
144144
# And finish by styling it up to your liking!
145145
fig = ridgeplot(
146146
samples=samples,
147-
labels=months,
147+
row_labels=months,
148148
colorscale="Inferno",
149149
bandwidth=4,
150150
kde_points=np.linspace(-40, 110, 400),

cicd_utils/cicd/test_helpers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from importlib.util import module_from_spec, spec_from_file_location
77
from pathlib import Path
88
from typing import TYPE_CHECKING, Any, TypeVar, cast
9+
from unittest.mock import MagicMock, patch
910

1011
if TYPE_CHECKING:
1112
from collections.abc import Iterator
@@ -22,8 +23,6 @@ def patch_plotly_show() -> Iterator[None]:
2223
and, instead, simply call
2324
:func:`plotly.io._utils.validate_coerce_fig_to_dict()`.
2425
"""
25-
from unittest.mock import MagicMock, patch
26-
2726
from plotly.io._utils import validate_coerce_fig_to_dict
2827

2928
def patched(

0 commit comments

Comments
 (0)