Skip to content

Commit d01b5e3

Browse files
seismanseisman
authored
Merge branch 'main' into refactor-meca
2 parents e8444ef + 951d30a commit d01b5e3

Some content is hidden

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

75 files changed

+736
-139
lines changed

‎.github/workflows/cache_data.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
# Checkout current git repository
2121
- name: Checkout
22-
uses: actions/checkout@v3.0.0
22+
uses: actions/checkout@v3.0.2
2323
with:
2424
# fecth all history so that setuptools-scm works
2525
fetch-depth: 0
@@ -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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: Checkout the repository
18-
uses: actions/checkout@v3.0.0
18+
uses: actions/checkout@v3.0.2
1919
with:
2020
path: repository
2121

2222
- name: Checkout the documentation
23-
uses: actions/checkout@v3.0.0
23+
uses: actions/checkout@v3.0.2
2424
with:
2525
ref: gh-pages
2626
path: documentation
@@ -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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
# Checkout current git repository
5151
- name: Checkout
52-
uses: actions/checkout@v3.0.0
52+
uses: actions/checkout@v3.0.2
5353
with:
5454
# fecth all history so that setuptools-scm works
5555
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Download cached remote files (artifacts) from GitHub
8282
- name: Download remote data from GitHub
83-
uses: dawidd6/action-download-artifact@v2.17.0
83+
uses: dawidd6/action-download-artifact@v2.19.0
8484
with:
8585
workflow: cache_data.yaml
8686
workflow_conclusion: success
@@ -107,7 +107,7 @@ jobs:
107107
run: make -C doc clean all
108108

109109
- name: Checkout the gh-pages branch
110-
uses: actions/checkout@v3.0.0
110+
uses: actions/checkout@v3.0.2
111111
with:
112112
ref: gh-pages
113113
# Checkout to this folder instead of the current one

‎.github/workflows/ci_tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272

7373
# Checkout current git repository
7474
- name: Checkout
75-
uses: actions/checkout@v3.0.0
75+
uses: actions/checkout@v3.0.2
7676
with:
7777
# fecth all history so that setuptools-scm works
7878
fetch-depth: 0
@@ -105,7 +105,7 @@ jobs:
105105

106106
# Download cached remote files (artifacts) from GitHub
107107
- name: Download remote data from GitHub
108-
uses: dawidd6/action-download-artifact@v2.17.0
108+
uses: dawidd6/action-download-artifact@v2.19.0
109109
with:
110110
workflow: cache_data.yaml
111111
workflow_conclusion: success
@@ -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@v3.0.0
150+
uses: codecov/codecov-action@v3.1.0
151151
with:
152152
file: ./coverage.xml # optional
153153
env_vars: OS,PYTHON,NUMPY

‎.github/workflows/ci_tests_dev.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Checkout current git repository
4747
- name: Checkout
48-
uses: actions/checkout@v3.0.0
48+
uses: actions/checkout@v3.0.2
4949
if: github.event_name != 'repository_dispatch'
5050
with:
5151
# fecth all history so that setuptools-scm works
@@ -62,7 +62,7 @@ jobs:
6262

6363
# Checkout the pull request branch
6464
- name: Checkout
65-
uses: actions/checkout@v3.0.0
65+
uses: actions/checkout@v3.0.2
6666
if: github.event_name == 'repository_dispatch'
6767
with:
6868
token: ${{ steps.generate-token.outputs.token }}
@@ -78,6 +78,7 @@ jobs:
7878
token: ${{ steps.generate-token.outputs.token }}
7979
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
8080
comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
81+
body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
8182

8283
# Install Mambaforge with conda-forge dependencies
8384
- name: Setup Mambaforge
@@ -105,6 +106,19 @@ jobs:
105106
106107
# Pull baseline image data from dvc remote (DAGsHub)
107108
- name: Pull baseline image data from dvc remote
109+
if: github.event_name == 'schedule'
110+
run: |
111+
ORIGINAL_BRANCH=$(git branch --show-current)
112+
# Pull down GMT 6.4 baseline images from the gmt-6.4 branch
113+
# https://github.com/GenericMappingTools/pygmt/pull/1883
114+
git checkout gmt-6.4
115+
dvc pull
116+
ls -lhR pygmt/tests/baseline/
117+
git checkout ${ORIGINAL_BRANCH}
118+
119+
# Pull baseline image data from dvc remote (DAGsHub)
120+
- name: Pull baseline image data from dvc remote
121+
if: github.event_name != 'schedule'
108122
run: |
109123
dvc pull
110124
ls -lhR pygmt/tests/baseline/
@@ -123,7 +137,7 @@ jobs:
123137

124138
# Download cached remote files (artifacts) from GitHub
125139
- name: Download remote data from GitHub
126-
uses: dawidd6/action-download-artifact@v2.17.0
140+
uses: dawidd6/action-download-artifact@v2.19.0
127141
with:
128142
workflow: cache_data.yaml
129143
workflow_conclusion: success
@@ -163,7 +177,7 @@ jobs:
163177

164178
# Upload diff images on test failure
165179
- name: Upload diff images if any test fails
166-
uses: actions/upload-artifact@v2
180+
uses: actions/upload-artifact@v3
167181
if: ${{ failure() }}
168182
with:
169183
name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }}

‎.github/workflows/dvc-diff.yml

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

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3.0.0
16+
uses: actions/checkout@v3.0.2
1717
with:
1818
# fetch all history so that dvc diff works
1919
fetch-depth: 0

‎.github/workflows/format-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
private_key: ${{ secrets.APP_PRIVATE_KEY }}
1515

1616
# Checkout the pull request branch
17-
- uses: actions/checkout@v3.0.0
17+
- uses: actions/checkout@v3.0.2
1818
with:
1919
token: ${{ steps.generate-token.outputs.token }}
2020
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
2121
ref: ${{ github.event.client_payload.pull_request.head.ref }}
2222

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v3.0.0
26+
uses: actions/checkout@v3.0.2
2727
with:
2828
# fetch all history so that setuptools-scm works
2929
fetch-depth: 0
3030

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3.0.0
19+
uses: actions/checkout@v3.0.2
2020

2121
- name: Setup data version control (DVC)
2222
uses: iterative/setup-dvc@v1.0.3
@@ -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.1
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
steps:
1717
# Checkout current git repository
1818
- name: Checkout
19-
uses: actions/checkout@v3.0.0
19+
uses: actions/checkout@v3.0.2
2020

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

0 commit comments

Comments
 (0)