Skip to content

Commit 49ae401

Browse files
seismanseisman
authored
Merge branch 'main' into test/gmt-dev-side-branch
2 parents 333c1d6 + d68b6b5 commit 49ae401

Some content is hidden

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

80 files changed

+792
-265
lines changed

‎.github/workflows/cache_data.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install dependencies
4040
run: |
4141
mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \
42-
build matplotlib
42+
build
4343
4444
# Install the package that we want to test
4545
- name: Install the package
@@ -54,7 +54,7 @@ jobs:
5454
5555
# Upload the downloaded files as artifacts to GitHub
5656
- name: Upload artifacts to GitHub
57-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v3
5858
with:
5959
name: gmt-cache
6060
path: |

‎.github/workflows/check-links.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
--exclude "^https://docs.generic-mapping-tools.org/latest/%s$"
4343
--exclude "^https://docs.generic-mapping-tools.org/latest/%3Cmodule-name%3E.html$"
4444
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
45-
--exclude "https://hackmd.io/@pygmt"
45+
--exclude "^https://hackmd.io/@pygmt"
46+
--exclude "^https://doi.org"
4647
--verbose
4748
"repository/**/*.rst"
4849
"repository/**/*.md"

‎.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
python-version: ['3.9']
27+
python-version: ['3.10']
2828
os: [ubuntu-latest, macOS-latest, windows-latest]
2929
# Is it a draft Pull Request (true or false)?
3030
isDraft:
3131
- ${{ github.event.pull_request.draft }}
32-
# Only run one job (Ubuntu + Python 3.9) for draft PRs
32+
# Only run one job (Ubuntu + Python 3.10) for draft PRs
3333
exclude:
3434
- os: macOS-latest
3535
isDraft: true

‎.github/workflows/ci_tests.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ['3.8', '3.9']
32+
python-version: ['3.8', '3.10']
3333
os: [ubuntu-latest, macOS-latest, windows-latest]
3434
# Is it a draft Pull Request (true or false)?
3535
isDraft:
3636
- ${{ github.event.pull_request.draft }}
37-
# Only run one job (Ubuntu + Python 3.9) for draft PRs
37+
# Only run one job (Ubuntu + Python 3.10) for draft PRs
3838
exclude:
3939
- os: macOS-latest
4040
isDraft: true
@@ -43,13 +43,13 @@ jobs:
4343
# - os: ubuntu-latest
4444
# python-version: 3.7
4545
# isDraft: true
46-
# Pair Python 3.8 with NumPy 1.19 and Python 3.9 with NumPy 1.22
47-
# Only install optional packages on Python 3.9/NumPy 1.22
46+
# Pair Python 3.8 with NumPy 1.19 and Python 3.10 with NumPy 1.22
47+
# Only install optional packages on Python 3.10/NumPy 1.22
4848
include:
4949
- python-version: '3.8'
5050
numpy-version: '1.19'
5151
optional-packages: ''
52-
- python-version: '3.9'
52+
- python-version: '3.10'
5353
numpy-version: '1.22'
5454
optional-packages: 'geopandas ipython'
5555
timeout-minutes: 30
@@ -139,15 +139,15 @@ jobs:
139139

140140
# Upload diff images on test failure
141141
- name: Upload diff images if any test fails
142-
uses: actions/upload-artifact@v2
142+
uses: actions/upload-artifact@v3
143143
if: ${{ failure() }}
144144
with:
145145
name: artifact-${{ runner.os }}-${{ matrix.python-version }}
146146
path: tmp-test-dir-with-unique-name
147147

148148
# Upload coverage to Codecov
149149
- name: Upload coverage to Codecov
150-
uses: codecov/codecov-action@v2.1.0
150+
uses: codecov/codecov-action@v3.0.0
151151
with:
152152
file: ./coverage.xml # optional
153153
env_vars: OS,PYTHON,NUMPY

‎.github/workflows/ci_tests_dev.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,14 @@ jobs:
7171
# fecth all history so that setuptools-scm works
7272
fetch-depth: 0
7373

74+
- name: Show job URL
75+
uses: peter-evans/create-or-update-comment@v2.0.0
76+
if: github.event_name == 'repository_dispatch' && (matrix.os == 'ubuntu-latest')
77+
with:
78+
token: ${{ steps.generate-token.outputs.token }}
79+
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
80+
comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
81+
7482
# Install Mambaforge with conda-forge dependencies
7583
- name: Setup Mambaforge
7684
uses: conda-incubator/setup-miniconda@v2.1.1
@@ -159,17 +167,8 @@ jobs:
159167

160168
# Upload diff images on test failure
161169
- name: Upload diff images if any test fails
162-
uses: actions/upload-artifact@v2
170+
uses: actions/upload-artifact@v3
163171
if: ${{ failure() }}
164172
with:
165173
name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }}
166174
path: tmp-test-dir-with-unique-name
167-
168-
- name: Add reaction
169-
uses: peter-evans/create-or-update-comment@v2
170-
if: github.event_name == 'repository_dispatch'
171-
with:
172-
token: ${{ steps.generate-token.outputs.token }}
173-
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
174-
comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
175-
reaction-type: hooray

‎.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ref: ${{ github.event.client_payload.pull_request.head.ref }}
2222

2323
# Setup Python environment
24-
- uses: actions/setup-python@v3.0.0
24+
- uses: actions/setup-python@v3.1.0
2525

2626
# Install formatting tools
2727
- name: Install formatting tools

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v3.0.0
32+
uses: actions/setup-python@v3.1.0
3333
with:
3434
python-version: '3.10'
3535

‎.github/workflows/release-baseline-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
shasum -a 256 baseline-images.zip
3535
3636
- name: Upload baseline image as a release asset
37-
uses: shogo82148/actions-upload-release-asset@v1.6.0
37+
uses: shogo82148/actions-upload-release-asset@v1.6.2
3838
with:
3939
upload_url: ${{ github.event.release.upload_url }}
4040
asset_path: baseline-images.zip

‎.github/workflows/style_checks.yaml

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

2121
# Setup Miniconda
2222
- name: Set up Python
23-
uses: actions/setup-python@v3.0.0
23+
uses: actions/setup-python@v3.1.0
2424
with:
2525
python-version: '3.10'
2626

‎CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ authors:
6464
family-names: Wessel
6565
affiliation: University of Hawai'i at Mānoa, USA
6666
orcid: https://orcid.org/0000-0001-5708-7336
67-
date-released: 2022-03-14
68-
doi: 10.5281/zenodo.6349217
67+
date-released: 2022-04-11
68+
doi: 10.5281/zenodo.6426493
6969
license: BSD-3-Clause
7070
repository-code: https://github.com/GenericMappingTools/pygmt
7171
type: software
72-
version: 0.6.0
72+
version: 0.6.1

0 commit comments

Comments
 (0)