Skip to content

Commit 7fcf57f

Browse files
authored
Merge branch 'main' into refactor/data_kind
2 parents 2701a4a + 7a51128 commit 7fcf57f

19 files changed

+94
-141
lines changed

.github/workflows/benchmarks.yml

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@v1.9.0
48+
uses: mamba-org/setup-micromamba@v2.0.0
4949
with:
5050
environment-name: pygmt
5151
condarc: |

.github/workflows/cache_data.yaml

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

4444
# Install Micromamba with conda-forge dependencies
4545
- name: Setup Micromamba
46-
uses: mamba-org/setup-micromamba@v1.9.0
46+
uses: mamba-org/setup-micromamba@v2.0.0
4747
with:
4848
environment-name: pygmt
4949
condarc: |

.github/workflows/ci_docs.yml

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

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/setup-micromamba@v1.9.0
83+
uses: mamba-org/setup-micromamba@v2.0.0
8484
with:
8585
environment-name: pygmt
8686
condarc: |

.github/workflows/ci_doctests.yaml

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

4343
# Install Micromamba with conda-forge dependencies
4444
- name: Setup Micromamba
45-
uses: mamba-org/setup-micromamba@v1.9.0
45+
uses: mamba-org/setup-micromamba@v2.0.0
4646
with:
4747
environment-name: pygmt
4848
condarc: |

.github/workflows/ci_tests.yaml

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

115115
# Install Micromamba with conda-forge dependencies
116116
- name: Setup Micromamba
117-
uses: mamba-org/setup-micromamba@v1.9.0
117+
uses: mamba-org/setup-micromamba@v2.0.0
118118
with:
119119
environment-name: pygmt
120120
condarc: |

.github/workflows/ci_tests_dev.yaml

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

5858
# Install Micromamba with conda-forge dependencies
5959
- name: Setup Micromamba
60-
uses: mamba-org/setup-micromamba@v1.9.0
60+
uses: mamba-org/setup-micromamba@v2.0.0
6161
with:
6262
environment-name: pygmt
6363
condarc: |

.github/workflows/ci_tests_legacy.yaml

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

5252
# Install Micromamba with conda-forge dependencies
5353
- name: Setup Micromamba
54-
uses: mamba-org/setup-micromamba@v1.9.0
54+
uses: mamba-org/setup-micromamba@v2.0.0
5555
with:
5656
environment-name: pygmt
5757
condarc: |

.github/workflows/publish-to-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ jobs:
7575
ls -lh dist/
7676
7777
- name: Publish to Test PyPI
78-
uses: pypa/[email protected].2
78+
uses: pypa/[email protected].3
7979
with:
8080
repository-url: https://test.pypi.org/legacy/
8181

8282
- name: Publish to PyPI
8383
if: startsWith(github.ref, 'refs/tags')
84-
uses: pypa/[email protected].2
84+
uses: pypa/[email protected].3

doc/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ PyGMT requires the following libraries to be installed:
9494
- [packaging](https://packaging.pypa.io)
9595

9696
:::{note}
97-
For the minimum supported versions of the dependencies, please see {doc}`minversions`.
97+
For the minimum supported versions of the dependencies, please see [](minversions.md).
9898
:::
9999

100100
The following are optional dependencies:

doc/maintenance.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This page contains instructions for project maintainers about how our setup works,
44
making releases, creating packages, etc.
55

6-
If you want to make a contribution to the project, see the {doc}`contributing` instead.
6+
If you want to make a contribution to the project, see the [](contributing.md) instead.
77

88
## Onboarding/Offboarding Access Checklist
99

@@ -22,7 +22,7 @@ communication tools we use.
2222
### As a Maintainer
2323

2424
- Add to the [pygmt-maintainers team](https://github.com/orgs/GenericMappingTools/teams/pygmt-maintainers) (gives 'maintain' permission to the repository)
25-
- Add to "Active Maintainers" on the {doc}`Team Gallery page <team>`
25+
- Add to "Active Maintainers" on the [Team Gallery page](team.md)
2626
- Add as a moderator on the [GMT forum](https://forum.generic-mapping-tools.org) (to see mod-only discussions) [optional]
2727
- Add as a maintainer on [ReadtheDocs](https://readthedocs.org/projects/pygmt-dev) [optional]
2828
- Add as a curator to the [GMT community](https://zenodo.org/communities/generic-mapping-tools/) on Zenodo (for making releases) [optional]
@@ -38,7 +38,7 @@ the onboarding access checklist:
3838

3939
- Move from the [pygmt-maintainers team](https://github.com/orgs/GenericMappingTools/teams/pygmt-maintainers)
4040
to the [pygmt-contributors team](https://github.com/orgs/GenericMappingTools/teams/pygmt-contributors)
41-
- Move from "Active Maintainers" to "Distinguished Contributors" on the {doc}`Team Gallery page <team>`
41+
- Move from "Active Maintainers" to "Distinguished Contributors" on the [Team Gallery page](team.md)
4242
- Remove 'maintain' permission from GMT forum, ReadTheDocs, Zenodo
4343

4444
## Branches
@@ -201,7 +201,7 @@ at `.github/release-drafter.yml`. Configuration settings can be found at
201201
<https://github.com/release-drafter/release-drafter>.
202202

203203
The drafted release notes are not perfect, so we will need to tidy it prior to
204-
publishing the actual release notes at {doc}`changes`.
204+
publishing the actual release notes at [](changes.md).
205205

206206
1. Go to <https://github.com/GenericMappingTools/pygmt/releases> and click on the
207207
'Edit' button next to the current draft release note. Copy the text of the

0 commit comments

Comments
 (0)