Skip to content

Commit f545e17

Browse files
committed
Merge branch 'main' into python-3.13
2 parents bfcec3a + 29f12f5 commit f545e17

Some content is hidden

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

56 files changed

+1615
-1242
lines changed

.dvcignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
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
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

.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ assignees: ''
1919

2020
**Before release**:
2121

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 core package dependencies (NumPy/Pandas/Xarray)
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)
2324
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
2425
- [ ] Check to ensure that:
2526
- [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r vX.Y.Z` from the base of the repository

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
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+
1115
**Reminders**
1216

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

.github/release-drafter.yml

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

.github/workflows/benchmarks.yml

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

8989
# Run the benchmark tests
9090
- name: Run benchmarks
91-
uses: CodSpeedHQ/[email protected].0
91+
uses: CodSpeedHQ/[email protected].1
9292
with:
9393
# 'bash -el -c' is needed to use the custom shell.
9494
# See https://github.com/CodSpeedHQ/action/issues/65.

.github/workflows/check-links.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,29 @@ jobs:
3535

3636
- name: Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v1.10.0
38+
uses: lycheeverse/lychee-action@v2.0.2
3939
with:
40+
fail: false # Don't fail action on broken links
4041
output: /tmp/lychee-out.md
4142
# 429: Too many requests
4243
args: >
4344
--accept 429
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]*$"
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"
4948
--exclude "^https://github.com/GenericMappingTools/gmt/releases/tag/X.Y.Z$"
5049
--exclude "^https://github.com/GenericMappingTools/pygmt/edit"
5150
--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]*$"
5253
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/tag/%7B%7Bpath%7D%7D"
53-
--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$"
6054
--exclude "^https://hackmd.io/@pygmt"
61-
--exclude "^https://doi.org"
62-
--exclude "^https://www.researchgate.net/"
6355
--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$"
58+
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
59+
--exclude "^https://www.researchgate.net/"
60+
--exclude "^https://zenodo.org/badge/DOI/"
6461
--verbose
6562
"repository/**/*.rst"
6663
"repository/**/*.md"

.github/workflows/ci_tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# In draft pull request, only two jobs on Linux are triggered to save on
1818
# Continuous Integration resources:
1919
#
20-
# - Minimum supported Python/NumPy/Pandas/Xarray versions following [SPEC 0](https://scientific-python.org/specs/spec-0000/)
21-
# - Latest Python/NumPy versions + optional packages (e.g. GeoPandas)
20+
# - Minimum supported Python, NumPy, pandas, Xarray versions following [SPEC 0](https://scientific-python.org/specs/spec-0000/)
21+
# - Latest Python, NumPy versions + optional packages (e.g. GeoPandas)
2222
#
2323
name: Tests
2424

@@ -65,8 +65,8 @@ jobs:
6565
isDraft: true
6666
- os: windows-latest
6767
isDraft: true
68-
# Pair Python 3.10 with the minimum supported versions of NumPy/Pandas/Xarray
69-
# and Python 3.13 with the latest versions of NumPy/Pandas/Xarray
68+
# Pair Python 3.10 with the minimum supported versions of NumPy, pandas, Xarray
69+
# and Python 3.13 with the latest versions of NumPy, pandas, Xarray
7070
# Only install optional packages on Python 3.13
7171
include:
7272
- python-version: '3.10'
@@ -79,7 +79,7 @@ jobs:
7979
pandas-version: ''
8080
xarray-version: ''
8181
optional-packages: ' contextily geopandas ipython pyarrow rioxarray sphinx-gallery'
82-
# The job below is for testing geopandas v0.x on Ubuntu.
82+
# The job below is for testing GeoPandas v0.x on Ubuntu.
8383
# The python-version here can't be the versions in the matrix.python-version
8484
# defined above. Otherwise, other jobs will be overridden by this one.
8585
- os: 'ubuntu-latest'

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Test PyGMT with GMT dev version on Linux/macOS/Windows
22
#
33
# This workflow runs regular PyGMT tests with the GMT dev version, and also pre-release
4-
# versions of several dependencies like NumPy, Pandas, Xarray, etc. If any tests fail,
4+
# versions of several dependencies like NumPy, pandas, Xarray, etc. If any tests fail,
55
# it also uploads the diff images as workflow artifacts. The GMT dev version is
66
# installed by fetching the latest source codes from the GMT master branch and
77
# compiling.

.github/workflows/ci_tests_legacy.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Test PyGMT with GMT legacy versions on Linux/macOS/Windows
22
#
3-
# This workflow runs regular PyGMT tests with GMT legacy versions. Due to the
4-
# minor baseline image changes between GMT versions, the workflow only runs
5-
# the tests but doesn't do image comparisons.
3+
# This workflow runs regular PyGMT tests with GMT legacy versions. Due to the minor
4+
# baseline image changes between GMT versions, the workflow only runs the tests but
5+
# doesn't do image comparisons.
66
#
77
# It is scheduled to run every Tuesday on the main branch.
88
#
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
os: [ubuntu-20.04, macos-12, windows-2019]
37+
os: [ubuntu-20.04, macos-13, windows-2019]
3838
gmt_version: ['6.4']
3939
timeout-minutes: 30
4040
defaults:
@@ -63,7 +63,7 @@ jobs:
6363
gmt=${{ matrix.gmt_version }}
6464
ghostscript<10
6565
numpy
66-
pandas<2
66+
pandas
6767
xarray
6868
netCDF4
6969
packaging
@@ -85,9 +85,9 @@ jobs:
8585
run: |
8686
# Download cached files to ~/.gmt directory and list them
8787
gh run download --name gmt-cache --dir ~/.gmt/
88-
# Change modification times of the two files, so GMT won't refresh it
89-
# The two files are in the `~/.gmt/server` directory for GMT<=6.4, and
90-
# in the `~/.gmt` directory for GMT>=6.5.
88+
# Change modification times of the two files, so GMT won't refresh it.
89+
# The two files are in the `~/.gmt/server` directory for GMT<=6.4, and in the
90+
# `~/.gmt` directory for GMT>=6.5.
9191
mkdir -p ~/.gmt/server/
9292
mv ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt ~/.gmt/server/
9393
touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ PyGMT has adopted [SPEC 0](https://scientific-python.org/specs/spec-0000/) along
194194
rest of the Scientific Python ecosystem, and therefore:
195195

196196
- Support for Python versions be dropped 3 years after their initial release.
197-
- Support for core package dependencies (NumPy/Pandas/Xarray) be dropped 2 years after
197+
- Support for core package dependencies (NumPy, pandas, Xarray) be dropped 2 years after
198198
their initial release.
199199

200200
Similarly, the PyGMT team has decided to discontinue support for GMT versions 3 years

0 commit comments

Comments
 (0)