Skip to content

Commit b570e40

Browse files
committed
Revert 158 commits
1 parent d0bad08 commit b570e40

File tree

215 files changed

+3137
-4960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+3137
-4960
lines changed

.dvcignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
# Add patterns of files dvc should ignore, which could improve the performance.
2-
# Learn more at https://dvc.org/doc/user-guide/project-structure/dvcignore-files
1+
# Add patterns of files dvc should ignore, which could improve
2+
# the performance. Learn more at
3+
# https://dvc.org/doc/user-guide/dvcignore

.github/ISSUE_TEMPLATE/1-bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ body:
2323
For more details, check out:
2424
2525
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
26-
- [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
26+
- [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
2727
2828
placeholder: "PASTE CODE HERE"
2929
render: python

.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,49 @@ assignees: ''
88
---
99

1010
**Release**: [v0.x.x](https://github.com/GenericMappingTools/pygmt/milestones/?)
11-
**Scheduled Date**: 20YY/MM/DD
12-
**Pull request due date**: 20YY/MM/DD
13-
**DOI**: `10.5281/zenodo.XXXXXXX`
11+
**Scheduled Date**: YYYY/MM/DD
12+
**Pull request due date**: YYYY/MM/DD
1413

1514
**Priority PRs/issues to complete prior to release**
16-
1715
- [ ] Wrap X ()
1816
- [ ] Wrap Y ()
1917

2018
**Before release**:
21-
22-
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/) to see if we need to bump the minimum supported versions of GMT, Python and
23-
core package dependencies (NumPy, pandas, Xarray)
24-
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
19+
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/) to see if we need to bump the minimum supported versions of GMT, Python and core package dependencies (NumPy/Pandas/Xarray)
20+
- [ ] Run `make codespell` to check common misspellings. If there are any, either fix them or add them to `ignore-words-list` in `pyproject.toml`
2521
- [ ] Check to ensure that:
26-
- [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r vX.Y.Z` from the base of the repository
2722
- [ ] All tests pass in the ["GMT Legacy Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_legacy.yaml)
2823
- [ ] All tests pass in the ["GMT Dev Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)
2924
- [ ] All tests pass in the ["Doctests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_doctests.yaml)
30-
- [ ] Update warnings in `pygmt/_show_versions.py` as well as notes in
31-
[Not working transparency](https://www.pygmt.org/dev/install.html#not-working-transparency)
32-
regarding GMT-Ghostscript incompatibility
25+
- [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r 'remove_version="vX.Y.Z"' pygmt` from the base of the repository
26+
- [ ] Update warnings in `pygmt.show_versions()` as well as notes in [Common installation issues](https://www.pygmt.org/dev/install.html#not-working-transparency)
27+
and [Testing your install]((https://www.pygmt.org/dev/install.html#testing-your-install) regarding GMT-Ghostscript incompatibility
3328
- [ ] Reserve a DOI on [Zenodo](https://zenodo.org) by clicking on "New Version"
34-
- [ ] Finish up the "Changelog entry for v0.x.x" Pull Request (Use the previous changelog PR as a reference)
35-
- [ ] Run `make codespell` to check common misspellings. If there are any, either fix them or add them to `ignore-words-list` in `pyproject.toml`
36-
- [ ] Draft the announcement on https://hackmd.io/@pygmt
29+
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
30+
- [ ] Finish up 'Changelog entry for v0.x.x' Pull Request:
31+
- [ ] Add a new entry in `doc/_static/version_switch.js` for documentation switcher
32+
- [ ] Update `CITATION.cff` and BibTeX at https://github.com/GenericMappingTools/pygmt#citing-pygmt
33+
- [ ] Update authorship list
34+
- [ ] Update DOI (and url for BibTeX)
35+
- [ ] Update version
36+
- [ ] Update date released
37+
- [ ] Add the documentation link `doc/minversions.md`
38+
- [ ] Add minimum required version information `doc/minversions.md`
39+
- [ ] Copy draft changelog from Release Drafter and edit it to look nice ([see maintainers guide for details](https://www.pygmt.org/dev/maintenance.html#updating-the-changelog))
3740

3841
**Release**:
39-
4042
- [ ] At the [PyGMT release page on GitHub](https://github.com/GenericMappingTools/pygmt/releases):
4143
- [ ] Edit the draft release notes with the finalized changelog
4244
- [ ] Set the tag version and release title to vX.Y.Z
4345
- [ ] Make a release by clicking the 'Publish Release' button, this will automatically create a tag too
44-
- [ ] Download pygmt-X.Y.Z.zip (rename to pygmt-vX.Y.Z.zip) and baseline-images.zip from
45-
the release page, and upload the two zip files to https://zenodo.org/deposit,
46-
ensure that they are filed under the correct reserved DOI
46+
- [ ] Manually upload the pygmt-vX.Y.Z.zip and baseline-images.zip files to https://zenodo.org/deposit, ensure that it is filed under the correct reserved DOI
4747

4848
**After release**:
49-
50-
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock)
51-
[Done automatically by conda-forge's bot. Remember to pin Python and SPEC0 versions]
49+
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Done automatically by conda-forge's bot, but remember to pin SPEC0 versions]
5250
- [ ] Bump PyGMT version on https://github.com/GenericMappingTools/try-gmt (after conda-forge update)
5351
- [ ] Announce the release on:
54-
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! Requires moderator status)
52+
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! draft on https://hackmd.io/@pygmt. requires moderator status)
5553
- [ ] [ResearchGate](https://www.researchgate.net) (after forum announcement, add new version as research item via the **code** category, be sure to include the corresponding new Zenodo DOI)
56-
5754
---
5855

5956
- [ ] Party :tada: (don't tick before all other checkboxes are ticked!)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
Fixes #
99

1010

11-
<!-- If significant changes to the documentation are made, please insert the link to the documentation page after it has been built. -->
12-
**Preview**:
13-
14-
1511
**Reminders**
1612

1713
- [ ] Run `make format` and `make check` to make sure the code follows the style guide.

.github/release-drafter.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ exclude-contributors:
2424
- 'actions-bot'
2525
- 'dependabot'
2626
- 'dependabot[bot]'
27-
- 'pre-commit-ci'
28-
- 'pre-commit-ci[bot]'
2927
category-template: '### $TITLE'
3028
change-template: '* $TITLE ([#$NUMBER]($URL))'
3129
sort-by: 'title'

.github/workflows/benchmarks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
jobs:
2727
benchmarks:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929
if: github.repository == 'GenericMappingTools/pygmt' && (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run/benchmark'))
3030
defaults:
3131
run:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
# Checkout current git repository
3636
- name: Checkout
37-
uses: actions/checkout@v4.2.2
37+
uses: actions/checkout@v4.1.7
3838
with:
3939
# fetch all history so that setuptools-scm works
4040
fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/setup-micromamba@v2.0.1
48+
uses: mamba-org/setup-micromamba@v1.9.0
4949
with:
5050
environment-name: pygmt
5151
condarc: |
@@ -87,8 +87,8 @@ jobs:
8787

8888
# Run the benchmark tests
8989
- name: Run benchmarks
90-
uses: CodSpeedHQ/action@v3.1.0
90+
uses: CodSpeedHQ/action@v3.0.0
9191
with:
9292
# 'bash -el -c' is needed to use the custom shell.
9393
# See https://github.com/CodSpeedHQ/action/issues/65.
94-
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed --override-ini addopts='--verbose'"
94+
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed"

.github/workflows/cache_data.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
steps:
3737
# Checkout current git repository
3838
- name: Checkout
39-
uses: actions/checkout@v4.2.2
39+
uses: actions/checkout@v4.1.7
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
4343

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

7777
# Upload the downloaded files as artifacts to GitHub
7878
- name: Upload artifacts to GitHub
79-
uses: actions/upload-artifact@v4.4.3
79+
uses: actions/upload-artifact@v4
8080
with:
8181
name: gmt-cache
82-
include-hidden-files: true
8382
path: |
8483
~/.gmt/cache
8584
~/.gmt/server

.github/workflows/check-links.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,44 @@ jobs:
2323

2424
steps:
2525
- name: Checkout the repository
26-
uses: actions/checkout@v4.2.2
26+
uses: actions/checkout@v4.1.7
2727
with:
2828
path: repository
2929

3030
- name: Checkout the documentation
31-
uses: actions/checkout@v4.2.2
31+
uses: actions/checkout@v4.1.7
3232
with:
3333
ref: gh-pages
3434
path: documentation
3535

3636
- name: Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v2.0.2
38+
uses: lycheeverse/lychee-action@v1.10.0
3939
with:
40-
fail: false # Don't fail action on broken links
4140
output: /tmp/lychee-out.md
4241
# 429: Too many requests
4342
args: >
4443
--accept 429
45-
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%s$"
46-
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%3Cmodule-name%3E.html$"
47-
--exclude "^https://doi.org"
44+
--exclude "^https://doi.org/10.5281/zenodo$"
45+
--exclude "^https://zenodo.org/badge/DOI/$"
46+
--exclude "^https://zenodo.org/badge/DOI/10.5281/zenodo$"
47+
--exclude "^https://github.com/GenericMappingTools/pygmt/pull/[0-9]*$"
48+
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/[0-9]*$"
4849
--exclude "^https://github.com/GenericMappingTools/gmt/releases/tag/X.Y.Z$"
4950
--exclude "^https://github.com/GenericMappingTools/pygmt/edit"
5051
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/new"
51-
--exclude "^https://github.com/GenericMappingTools/pygmt/pull/[0-9]*$"
52-
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/[0-9]*$"
5352
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/tag/%7B%7Bpath%7D%7D"
54-
--exclude "^https://hackmd.io/@pygmt"
55-
--exclude "^https://test.pypi.org/simple/"
56-
--exclude "^https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"
57-
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
5853
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
54+
--exclude "^git"
55+
--exclude "^file://"
56+
--exclude "https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"
57+
--exclude "^https://docs.generic-mapping-tools.org/6.5/%s$"
58+
--exclude "^https://docs.generic-mapping-tools.org/6.5/%3Cmodule-name%3E.html$"
59+
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
60+
--exclude "^https://hackmd.io/@pygmt"
61+
--exclude "^https://doi.org"
5962
--exclude "^https://www.researchgate.net/"
60-
--exclude "^https://zenodo.org/badge/DOI/"
63+
--exclude "^https://test.pypi.org/simple/"
6164
--verbose
6265
"repository/**/*.rst"
6366
"repository/**/*.md"

.github/workflows/ci_docs.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
# Checkout current git repository
7171
- name: Checkout
72-
uses: actions/checkout@v4.2.2
72+
uses: actions/checkout@v4.1.7
7373
with:
7474
# fetch all history so that setuptools-scm works
7575
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/setup-micromamba@v2.0.1
83+
uses: mamba-org/setup-micromamba@v1.9.0
8484
with:
8585
environment-name: pygmt
8686
condarc: |
@@ -94,7 +94,7 @@ jobs:
9494
create-args: >-
9595
python=3.12
9696
gmt=6.5.0
97-
ghostscript=10.04.0
97+
ghostscript=10.03.1
9898
numpy
9999
pandas
100100
xarray
@@ -103,7 +103,6 @@ jobs:
103103
contextily
104104
geopandas<1.0
105105
ipython
106-
pyarrow
107106
rioxarray
108107
make
109108
pip
@@ -115,7 +114,7 @@ jobs:
115114
sphinx-copybutton
116115
sphinx-design
117116
sphinx-gallery
118-
sphinx_rtd_theme<3.0
117+
sphinx_rtd_theme
119118
120119
# Download cached remote files (artifacts) from GitHub
121120
- name: Download remote data from GitHub
@@ -139,7 +138,7 @@ jobs:
139138
run: make -C doc clean all
140139

141140
- name: Checkout the gh-pages branch
142-
uses: actions/checkout@v4.2.2
141+
uses: actions/checkout@v4.1.7
143142
with:
144143
ref: gh-pages
145144
# Checkout to this folder instead of the current one

.github/workflows/ci_doctests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
steps:
3636
# Checkout current git repository
3737
- name: Checkout
38-
uses: actions/checkout@v4.2.2
38+
uses: actions/checkout@v4.1.7
3939
with:
4040
# fetch all history so that setuptools-scm works
4141
fetch-depth: 0
4242

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

0 commit comments

Comments
 (0)