Skip to content

Commit 5078cb4

Browse files
authored
Merge branch 'main' into grdcut-polygon
2 parents e564199 + 32eb655 commit 5078cb4

19 files changed

Lines changed: 143 additions & 133 deletions

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Install Micromamba with conda-forge dependencies
5050
- name: Setup Micromamba
51-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
51+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
5252
with:
5353
environment-name: pygmt
5454
cache-environment: true

.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Install Micromamba with conda-forge dependencies
4848
- name: Setup Micromamba
49-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
49+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
5050
with:
5151
environment-name: pygmt
5252
create-args: >-

.github/workflows/ci_docs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
os: [ubuntu-latest, macos-latest, windows-latest]
56+
os: [ubuntu-latest, macos-latest]
57+
# os: [ubuntu-latest, macos-latest, windows-latest]
5758
# Is it a draft Pull Request (true or false)?
5859
isDraft:
5960
- ${{ github.event.pull_request.draft }}
@@ -83,7 +84,7 @@ jobs:
8384

8485
# Install Micromamba with conda-forge dependencies
8586
- name: Setup Micromamba
86-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
87+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
8788
with:
8889
environment-name: pygmt
8990
cache-environment: true

.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
48+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
4949
with:
5050
environment-name: pygmt
5151
create-args: >-

.github/workflows/ci_tests.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151
test:
5252
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
5353
runs-on: ${{ matrix.os }}
54+
environment:
55+
name: pr-tests
5456
permissions:
5557
id-token: write # This is required for requesting OIDC token for codecov
5658
strategy:
@@ -116,7 +118,7 @@ jobs:
116118

117119
# Install Micromamba with conda-forge dependencies
118120
- name: Setup Micromamba
119-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
121+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
120122
with:
121123
environment-name: pygmt
122124
cache-environment: true
@@ -151,7 +153,7 @@ jobs:
151153
GH_TOKEN: ${{ github.token }}
152154

153155
- name: Install uv
154-
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
156+
uses: astral-sh/setup-uv@eb1897b8dc4b5d5bfe39a428a8f2304605e0983c # v7.0.0
155157
with:
156158
activate-environment: true
157159
python-version: ${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Install Micromamba with conda-forge dependencies
6262
- name: Setup Micromamba
63-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
63+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
6464
with:
6565
environment-name: pygmt
6666
cache-environment: true

.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
# Install Micromamba with conda-forge dependencies
5656
- name: Setup Micromamba
57-
uses: mamba-org/setup-micromamba@b09ef9b599704322748535812ca03efb2625677b # v2.0.5
57+
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
5858
with:
5959
environment-name: pygmt
6060
create-args: >-

.pre-commit-config.yaml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
# See https://pre-commit.com for more information
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
4-
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v5.0.0
6-
hooks:
7-
- id: check-added-large-files
8-
- id: check-yaml
9-
- id: end-of-file-fixer
10-
- id: trailing-whitespace
11-
- repo: https://github.com/Lucas-C/pre-commit-hooks
12-
rev: v1.5.5
13-
hooks:
14-
- id: forbid-crlf
15-
- id: remove-crlf
16-
- id: chmod
17-
args: ['644']
18-
- repo: https://github.com/woodruffw/zizmor-pre-commit
19-
rev: v1.11.0
20-
hooks:
21-
- id: zizmor
22-
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v6.0.0
6+
hooks:
7+
- id: check-added-large-files
8+
- id: check-yaml
9+
- id: end-of-file-fixer
10+
- id: trailing-whitespace
11+
- repo: https://github.com/Lucas-C/pre-commit-hooks
12+
rev: v1.5.5
13+
hooks:
14+
- id: forbid-crlf
15+
- id: remove-crlf
16+
- id: chmod
17+
args: ["644"]
18+
- repo: https://github.com/zizmorcore/zizmor-pre-commit
19+
rev: v1.14.2
20+
hooks:
21+
- id: zizmor
2322

2423
# https://pre-commit.ci/#configuration
2524
ci:

doc/_templates/autosummary/class.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.. rubric:: Attributes
99

1010
{% for item in attributes %}
11-
.. autoproperty::
11+
.. autoattribute::
1212
{{ objname }}.{{ item }}
1313
{% endfor %}
1414
{% endif %}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{ fullname | escape | underline }}
2+
3+
.. currentmodule:: {{ module }}
4+
5+
.. autoclass:: {{ objname }}
6+
:members:
7+
:member-order: bysource
8+
9+
.. minigallery:: {{ fullname }}
10+
:add-heading:
11+
12+
.. raw:: html
13+
14+
<div style='clear:both'></div>

0 commit comments

Comments
 (0)