Skip to content

Commit

Permalink
Merge branch 'main' into renovate/numpy-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
paddyroddy authored Aug 8, 2024
2 parents f43e892 + 1daf9d0 commit 37bf181
Show file tree
Hide file tree
Showing 26 changed files with 32 additions and 34 deletions.
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ body:
attributes:
label: Describe the Solution You'd Like
description: A clear and concise description of what you want to happen.
validations:
required: true
- id: alternatives
type: textarea
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id-token: write
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/python/deployment@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/python/deployment@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
pyproject-toml: ./pyproject.toml
python-version: "3.12"
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/python/pdoc@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/python/pdoc@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
docs-dependency-section: .[docs]
gh-pages-publish-directory: ./html/sleplet
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Set up python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5
with:
python-version: "3.12"
cache: pip
Expand All @@ -35,7 +35,7 @@ jobs:
key: readme-${{ hashFiles('pyproject.toml') }}

- name: Install dependencies
run: python -m pip install -e .[readme]
run: python -m pip install -e '.[readme]'

- name: Run examples in the README
run: python -m pytest --codeblocks .github README.md documentation
Expand All @@ -47,7 +47,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Set up python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5
with:
python-version: "3.12"
cache: pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/licence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/licence@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/licence@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
licence-file: ./LICENCE.txt
2 changes: 1 addition & 1 deletion .github/workflows/links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
timeout-minutes: 2
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/links@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/links@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/linting@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/linting@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
pre-commit-config: ./.pre-commit-config.yaml
2 changes: 1 addition & 1 deletion .github/workflows/paper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Upload
# yamllint disable-line rule:line-length
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
with:
name: paper
path: paper/paper.pdf
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- "3.12"
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/python/tox@18d8678a5aea33da18556ae7823433325631dadd # v0
- uses: paddyroddy/.github/actions/python/tox@ac424c5397b4f9c7a6c082bb7196373a887e44f4 # v0
with:
cache-path: |-
.tox
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/paddyroddy/.github
rev: v0.195.0
rev: v0.213.0
hooks:
- id: general-hooks
- id: python-hooks
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/functions/axisymmetric_wavelets.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.complex128]

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/functions/ridgelets.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def _compute_ring(self: typing_extensions.Self) -> npt.NDArray[np.complex128]:

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/functions/slepian.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _validate_rank(self: typing_extensions.Self) -> None:

@pydantic.field_validator("rank")
def _check_rank(
cls, # noqa: ANN101
cls,
v: int,
) -> int:
if v < 0:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/functions/slepian_wavelets.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.float64]:

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
4 changes: 2 additions & 2 deletions src/sleplet/functions/spherical_harmonic.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _setup_args(self: typing_extensions.Self) -> None:

@pydantic.field_validator("ell")
def _check_ell(
cls, # noqa: ANN101
cls,
v: int,
info: pydantic.ValidationInfo,
) -> int:
Expand All @@ -65,7 +65,7 @@ def _check_ell(

@pydantic.field_validator("m")
def _check_m(
cls, # noqa: ANN101
cls,
v: int,
info: pydantic.ValidationInfo,
) -> int:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/meshes/mesh_basis_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _validate_rank(self: typing_extensions.Self) -> None:

@pydantic.field_validator("rank")
def _check_rank(
cls, # noqa: ANN101
cls,
v: int,
) -> int:
if v < 0:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/meshes/mesh_slepian_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def _validate_rank(self: typing_extensions.Self) -> None:

@pydantic.field_validator("rank")
def _check_rank(
cls, # noqa: ANN101
cls,
v: int,
) -> int:
if v < 0:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _create_wavelet_coefficients(

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
2 changes: 1 addition & 1 deletion src/sleplet/meshes/mesh_slepian_wavelets.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.float64]:

@pydantic.field_validator("j")
def _check_j(
cls, # noqa: ANN101
cls,
v: int | None,
info: pydantic.ValidationInfo,
) -> int | None:
Expand Down
8 changes: 4 additions & 4 deletions src/sleplet/slepian/region.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def _identify_region(self: typing_extensions.Self) -> None:

@pydantic.field_validator("phi_max")
def _check_phi_max(
cls, # noqa: ANN101
cls,
v: float,
) -> float:
if v < sleplet._vars.PHI_MIN_DEFAULT:
Expand All @@ -110,7 +110,7 @@ def _check_phi_max(

@pydantic.field_validator("phi_min")
def _check_phi_min(
cls, # noqa: ANN101
cls,
v: float,
) -> float:
if v < sleplet._vars.PHI_MIN_DEFAULT:
Expand All @@ -126,7 +126,7 @@ def _check_phi_min(

@pydantic.field_validator("theta_max")
def _check_theta_max(
cls, # noqa: ANN101
cls,
v: float,
) -> float:
if v < sleplet._vars.THETA_MIN_DEFAULT:
Expand All @@ -142,7 +142,7 @@ def _check_theta_max(

@pydantic.field_validator("theta_min")
def _check_theta_min(
cls, # noqa: ANN101
cls,
v: float,
) -> float:
if v < sleplet._vars.THETA_MIN_DEFAULT:
Expand Down
4 changes: 2 additions & 2 deletions src/sleplet/slepian/slepian_polar_cap.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def _clean_evals_and_evecs(

@pydantic.field_validator("order")
def _check_order(
cls, # noqa: ANN101
cls,
v: int | npt.NDArray[np.int_] | None,
info: pydantic.ValidationInfo,
) -> int | npt.NDArray[np.int_] | None:
Expand All @@ -410,7 +410,7 @@ def _check_order(

@pydantic.field_validator("theta_max")
def _check_theta_max(
cls, # noqa: ANN101
cls,
v: float,
) -> float:
if v == 0:
Expand Down

0 comments on commit 37bf181

Please sign in to comment.