Skip to content

Commit b8fe689

Browse files
authored
Merge branch 'main' into alias-system
2 parents 9da950c + 99a6340 commit b8fe689

29 files changed

+239
-267
lines changed

.github/workflows/cache_data.yaml

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

7676
# Upload the downloaded files as artifacts to GitHub
7777
- name: Upload artifacts to GitHub
78-
uses: actions/[email protected].1
78+
uses: actions/[email protected].2
7979
with:
8080
name: gmt-cache
8181
include-hidden-files: true

.github/workflows/check-links.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check links in the repository and documentation
22
#
3-
# This workflow runs the lychee tool to check all external links in plaintext
4-
# and HTML files. It will create an issue if broken links are found.
3+
# This workflow runs the lychee tool to check all external links in plaintext and HTML
4+
# files. It will create an issue if broken links are found.
55
#
66
# It is scheduled to run weekly at 12 noon every Sunday.
77
#
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Link Checker
4242
id: lychee
43-
uses: lycheeverse/lychee-action@v2.3.0
43+
uses: lycheeverse/lychee-action@v2.4.0
4444
with:
4545
fail: false # Don't fail action on broken links
4646
output: /tmp/lychee-out.md
@@ -76,7 +76,7 @@ jobs:
7676
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
7777

7878
- name: Create Issue From File
79-
if: ${{ steps.lychee.outputs.exit_code }} != 0
79+
if: steps.lychee.outputs.exit_code != 0
8080
run: |
8181
cd repository/
8282
title="Link Checker Report on ${CURRENT_DATE}"

.github/workflows/ci_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
cd ../..
152152
153153
- name: Upload PDF as artifact for previewing on pull requests
154-
uses: actions/[email protected].1
154+
uses: actions/[email protected].2
155155
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
156156
with:
157157
name: artifact-pygmt-docs-pdf

.github/workflows/ci_tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ jobs:
7272
include:
7373
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
7474
- python-version: '3.11'
75-
numpy-version: '1.25'
76-
pandas-version: '=2.0'
77-
xarray-version: '=2023.04'
78-
optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery'
75+
numpy-version: '1.26'
76+
pandas-version: '=2.1'
77+
xarray-version: '=2023.07'
78+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
7979
# Python 3.13 + core packages (latest versions) + optional packages
8080
- python-version: '3.13'
8181
numpy-version: '2.2'
8282
pandas-version: ''
8383
xarray-version: ''
84-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery'
84+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
8585
# Python 3.12 + core packages (Linux only)
8686
- os: 'ubuntu-latest'
8787
python-version: '3.12'
@@ -175,7 +175,7 @@ jobs:
175175

176176
# Upload diff images on test failure
177177
- name: Upload diff images if any test fails
178-
uses: actions/[email protected].1
178+
uses: actions/[email protected].2
179179
if: failure()
180180
with:
181181
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

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

187187
# Upload diff images on test failure
188188
- name: Upload diff images if any test fails
189-
uses: actions/[email protected].1
189+
uses: actions/[email protected].2
190190
if: ${{ failure() }}
191191
with:
192192
name: artifact-${{ matrix.os }}-GMT-${{ matrix.gmt_git_ref }}

.github/workflows/ci_tests_legacy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2019]
39+
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2022]
4040
gmt_version: ['6.4']
4141
timeout-minutes: 30
4242
defaults:
@@ -61,15 +61,15 @@ jobs:
6161
python=3.11
6262
gmt=${{ matrix.gmt_version }}
6363
ghostscript<10
64-
numpy<2
64+
numpy=1.26
6565
pandas
6666
xarray
6767
netCDF4
6868
packaging
69-
contextily
70-
geopandas
69+
contextily=1.5
70+
geopandas=1.0
7171
ipython
72-
pyarrow-core
72+
pyarrow-core=16
7373
rioxarray
7474
sphinx-gallery
7575
make

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
# Generate token from GenericMappingTools bot
19-
- uses: actions/create-github-app-token@v1.12.0
19+
- uses: actions/create-github-app-token@v2.0.2
2020
id: generate-token
2121
with:
2222
app-id: ${{ secrets.APP_ID }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ls -lh dist/
7575
7676
- name: Store the distribution packages
77-
uses: actions/[email protected].1
77+
uses: actions/[email protected].2
7878
with:
7979
name: python-package-distributions
8080
path: dist/
@@ -93,7 +93,7 @@ jobs:
9393

9494
steps:
9595
- name: Download all the dists
96-
uses: actions/[email protected].0
96+
uses: actions/[email protected].1
9797
with:
9898
name: python-package-distributions
9999
path: dist/
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- name: Download all the dists
120-
uses: actions/[email protected].0
120+
uses: actions/[email protected].1
121121
with:
122122
name: python-package-distributions
123123
path: dist/

.mailmap

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Dongdong Tian <[email protected]>
2+
3+
Jiayuan Yao <[email protected]>
4+
5+
Jing-Hui Tong <[email protected]>
6+
7+
Max Jones <[email protected]>
8+
9+
10+
11+
12+
13+
14+
Wei Ji Leong <[email protected]>
15+
16+
17+
18+
19+

AUTHORSHIP.md

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,86 @@
11
# Authorship guidelines for academic papers and software archives
22

3-
First of all, we are deeply thankful to everyone who has helped make PyGMT
4-
what it is today. Our goal for this document is to establish guidelines
5-
for giving credit to contributors for their work.
6-
To do so, we will attempt to define:
3+
First of all, we are deeply thankful to everyone who has helped to make PyGMT what it
4+
is today. Our goal for this document is to establish guidelines for giving credit to
5+
contributors for their work. To do so, we will attempt to define:
76

87
- Fair and diverse ways of providing recognition for contributors' efforts.
9-
- Define _contributions_ in a broad way: writing code and/or documentation,
10-
providing ideas, fostering the community, etc.
8+
- Define _contributions_ in a broad way: writing code and/or documentation, providing
9+
ideas, fostering the community, etc.
1110

12-
The following are the ways in which individuals who have contributed will be
13-
recognized.
11+
The following are the ways in which individuals who have contributed will be recognized.
1412

15-
> **Note**: These policies are not set in stone and may be changed to
16-
> accommodate the growth of the project or the preferences of the community.
13+
> **Note**: These policies are not set in stone and may be changed to accommodate the
14+
> growth of the project or the preferences of the community.
1715
1816
## The `AUTHORS.md` file
1917

20-
Anyone who has contributed a pull request to the project is welcome to add
21-
themselves to the `AUTHORS.md` file. This file lives in the repository and is
22-
packaged with distributions. This is an optional process.
18+
Anyone who has contributed a pull request to the project is welcome to add themselves to
19+
the `AUTHORS.md` file. This file lives in the repository and is packaged with
20+
distributions. This is an optional process.
2321

2422
## Changelog for each release
2523

26-
Every time we make a release, everyone who has made a commit to the repository
27-
since the previous release will be mentioned in the changelog entry. If their
28-
full name is available on GitHub, we will use it. Otherwise, we will use the
24+
Every time we make a release, everyone who has made a contribution (commits or PR
25+
reviews) to the repository since the previous release will be mentioned in the changelog.
26+
If their full name is available on GitHub, we will use it. Otherwise, we will use the
2927
GitHub handle. This is a way of saying "Thank you".
3028

3129
## Authorship on Zenodo archives of releases
3230

33-
Anyone who has contributed to the repository (i.e., appears on `git log`) will
34-
be invited to be an author on the Zenodo archive of new releases.
31+
Anyone who has contributed to the repository (i.e., appears on `git log`) will be
32+
invited to be an author on the Zenodo archive of new releases.
3533

36-
To be included as an author, you *must* add the following to the `AUTHORS.md`
37-
file of the repository:
34+
To be included as an author, you *must* add the following to the `AUTHORS.md` file of
35+
the repository:
3836

3937
1. Full name (and a link to your website or GitHub page)
4038
2. [ORCID](https://orcid.org) (optional)
4139
3. Affiliation (if omitted, we will use "Unaffiliated")
4240

43-
The order of authors will be defined by the number of commits to the repository
44-
(`git shortlog -sne`). The order can also be changed on a case-by-case basis.
45-
The most common reasons for case-by-case changes are contributions to the PyGMT
46-
project that due not relate to commit numbers, including developing PyGMT
47-
lessons such as the [ROSES unit](https://www.youtube.com/watch?v=SSIGJEe0BIk),
48-
organizing workshops/sprints such as the
49-
[FOSS4G Workshop](https://github.com/GenericMappingTools/foss4g2019oceania),
50-
the 2020 and 2021 SciPy sprints, writing grants/proposals to support PyGMT,
51-
and team programming efforts (including reviewing PRs).
41+
The order of authors will be defined by the number of contributions (including commits
42+
and PR reviews) to the repository
43+
(`git shortlog -sne --group=author --group=trailer:co-authored-by`).
44+
The order can also be changed on a case-by-case basis. The most common reasons for
45+
case-by-case changes are contributions to the PyGMT project that do not relate to
46+
commit numbers, including developing PyGMT lessons such as the
47+
[ROSES unit](https://www.youtube.com/watch?v=SSIGJEe0BIk), organizing workshops/sprints
48+
such as the [AGU24 Workshop](https://github.com/GenericMappingTools/agu24workshop) or
49+
2020 and 2021 SciPy sprints, writing grants/proposals to support PyGMT, and team
50+
programming efforts (including reviewing PRs).
5251

53-
If you have contributed and do not wish to be included in Zenodo archives,
54-
there are a few options:
52+
If you have contributed and do not wish to be included in Zenodo archives, there are a
53+
few options:
5554

5655
1. Don't add yourself to `AUTHORS.md`
5756
2. Remove yourself from `AUTHORS.md`
58-
3. Indicate next to your name on `AUTHORS.md` that you do not wish to be
59-
included with something like `(not included in Zenodo)`.
57+
3. Indicate next to your name on `AUTHORS.md` that you do not wish to be included with
58+
something like `(not included in Zenodo)`.
6059

61-
Note that authors included in the Zenodo archive will also have their name
62-
listed in the `CITATION.cff` file. This is a machine (and human) readable file
63-
that enables people to cite the PyGMT software easily, and the file will be
64-
updated by the PyGMT maintainers each time a new release is made.
60+
Note that authors included in the Zenodo archive will also have their name listed in the
61+
`CITATION.cff` file. This is a machine (and human) readable file that enables people to
62+
cite the PyGMT software easily, and the file will be updated by the PyGMT maintainers
63+
each time a new release is made.
6564

6665
## Scientific publications (papers)
6766

68-
We aim to write academic papers for most of our software packages. Ideally, we
69-
will publish updated papers for major changes or significant new components of
70-
the package.
67+
We aim to write academic papers for most of our software packages. Ideally, we will
68+
publish updated papers for major changes or significant new components of the package.
7169

72-
To be included as an author on the paper, you *must* satisfy the following
73-
criteria:
70+
To be included as an author on the paper, you *must* satisfy the following criteria:
7471

75-
1. Have made multiple and regular contributions to the repository, or the GMT
76-
repository, in numerous facets, such as wrapping functions, testing, and/or
77-
writing documentation.
78-
2. Have made non-coding contributions, including project administration and
79-
decision making.
72+
1. Have made multiple and regular contributions to the repository, or the GMT repository,
73+
in numerous facets, such as wrapping functions, testing, and/or writing documentation.
74+
2. Have made non-coding contributions, including project administration and decision
75+
making.
8076
3. Have participated in the writing and reviewing of the paper.
81-
4. Add your full name, affiliation, and (optionally) ORCID to the paper. These
82-
can be submitted on pull requests to the corresponding paper repository.
83-
5. Write and/or read and review the manuscript in a timely manner and provide
84-
comments on the paper (even if it's just an "OK", but preferably more).
85-
86-
The order of authors will be defined by the number of commits made since the
87-
previous major release that has an associated paper (`git shortlog
88-
vX.0.0...HEAD -sne`). The order of any author who hasn't made any commits will
89-
be decided by all authors. The order can also be changed on a case-by-case
90-
basis.
77+
4. Add your full name, affiliation, and (optionally) ORCID to the paper. These can be
78+
submitted on pull requests to the corresponding paper repository.
79+
5. Write and/or read and review the manuscript in a timely manner and provide comments
80+
on the paper (even if it's just an "OK", but preferably more).
81+
82+
The order of authors will be defined by the number of commits made since the previous
83+
major release that has an associated paper
84+
(`git shortlog vX.Y.Z..HEAD -sne --group=author --group=trailer:co-authored-by`).
85+
The order of any author who hasn't made any commits will be decided by all authors. The
86+
order can also be changed on a case-by-case basis.

0 commit comments

Comments
 (0)