Skip to content

Commit b58af8b

Browse files
weiji14weiji14
committed
Merge branch 'main' into arg_with_space
2 parents 2ba8420 + 14a4947 commit b58af8b

File tree

119 files changed

+1020
-1347
lines changed

Some content is hidden

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

119 files changed

+1020
-1347
lines changed

‎.github/workflows/cache_data.yaml

+1-3
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@v2.4.0
22+
uses: actions/checkout@v3.0.0
2323
with:
2424
# fecth all history so that setuptools-scm works
2525
fetch-depth: 0
@@ -51,8 +51,6 @@ jobs:
5151
- name: Download remote data
5252
run: |
5353
python -c "from pygmt.helpers.testing import download_test_data; download_test_data()"
54-
env:
55-
GMT_DATA_SERVER: https://oceania.generic-mapping-tools.org/
5654
5755
# Upload the downloaded files as artifacts to GitHub
5856
- name: Upload artifacts to GitHub

‎.github/workflows/check-links.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515

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

2222
- name: Checkout the documentation
23-
uses: actions/checkout@v2.4.0
23+
uses: actions/checkout@v3.0.0
2424
with:
2525
ref: gh-pages
2626
path: documentation
2727

2828
- name: Link Checker
29-
uses: lycheeverse/lychee-action@v1.2.0
29+
uses: lycheeverse/lychee-action@v1.3.2
3030
with:
3131
# 429: Too many requests
3232
args: >

‎.github/workflows/ci_docs.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- '*.json'
1414
- 'LICENSE.txt'
1515
- '.gitignore'
16-
- '.pylintrc'
1716
release:
1817
types:
1918
- published
@@ -50,7 +49,7 @@ jobs:
5049

5150
# Checkout current git repository
5251
- name: Checkout
53-
uses: actions/checkout@v2.4.0
52+
uses: actions/checkout@v3.0.0
5453
with:
5554
# fecth all history so that setuptools-scm works
5655
fetch-depth: 0
@@ -81,7 +80,7 @@ jobs:
8180

8281
# Download cached remote files (artifacts) from GitHub
8382
- name: Download remote data from GitHub
84-
uses: dawidd6/action-download-artifact@v2.16.0
83+
uses: dawidd6/action-download-artifact@v2.17.0
8584
with:
8685
workflow: cache_data.yaml
8786
workflow_conclusion: success
@@ -108,7 +107,7 @@ jobs:
108107
run: make -C doc clean all
109108

110109
- name: Checkout the gh-pages branch
111-
uses: actions/checkout@v2.4.0
110+
uses: actions/checkout@v3.0.0
112111
with:
113112
ref: gh-pages
114113
# Checkout to this folder instead of the current one

‎.github/workflows/ci_tests.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- 'README.rst'
1616
- 'LICENSE.txt'
1717
- '.gitignore'
18-
- '.pylintrc'
1918
release:
2019
types:
2120
- published
@@ -44,14 +43,14 @@ jobs:
4443
# - os: ubuntu-latest
4544
# python-version: 3.7
4645
# isDraft: true
47-
# Pair Python 3.8 with NumPy 1.19 and Python 3.9 with NumPy 1.21
48-
# Only install optional packages on Python 3.9/NumPy 1.21
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
4948
include:
5049
- python-version: '3.8'
5150
numpy-version: '1.19'
5251
optional-packages: ''
5352
- python-version: '3.9'
54-
numpy-version: '1.21'
53+
numpy-version: '1.22'
5554
optional-packages: 'geopandas ipython'
5655
timeout-minutes: 30
5756
defaults:
@@ -73,7 +72,7 @@ jobs:
7372

7473
# Checkout current git repository
7574
- name: Checkout
76-
uses: actions/checkout@v2.4.0
75+
uses: actions/checkout@v3.0.0
7776
with:
7877
# fecth all history so that setuptools-scm works
7978
fetch-depth: 0
@@ -97,7 +96,7 @@ jobs:
9796
mamba install gmt=6.3.0 numpy=${{ matrix.numpy-version }} \
9897
pandas xarray netCDF4 packaging \
9998
${{ matrix.optional-packages }} \
100-
dvc=2.8.2 make pytest>=6.0 \
99+
dvc make pytest>=6.0 \
101100
pytest-cov pytest-mpl sphinx-gallery tomli
102101
103102
# Show installed pkg information for postmortem diagnostic
@@ -106,7 +105,7 @@ jobs:
106105

107106
# Download cached remote files (artifacts) from GitHub
108107
- name: Download remote data from GitHub
109-
uses: dawidd6/action-download-artifact@v2.16.0
108+
uses: dawidd6/action-download-artifact@v2.17.0
110109
with:
111110
workflow: cache_data.yaml
112111
workflow_conclusion: success

‎.github/workflows/ci_tests_dev.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- 'README.rst'
1616
- 'LICENSE.txt'
1717
- '.gitignore'
18-
- '.pylintrc'
1918
repository_dispatch:
2019
types: [test-gmt-dev-command]
2120
# Schedule daily tests
@@ -46,7 +45,7 @@ jobs:
4645

4746
# Checkout current git repository
4847
- name: Checkout
49-
uses: actions/checkout@v2.4.0
48+
uses: actions/checkout@v3.0.0
5049
if: github.event_name != 'repository_dispatch'
5150
with:
5251
# fecth all history so that setuptools-scm works
@@ -63,7 +62,7 @@ jobs:
6362

6463
# Checkout the pull request branch
6564
- name: Checkout
66-
uses: actions/checkout@v2.4.0
65+
uses: actions/checkout@v3.0.0
6766
if: github.event_name == 'repository_dispatch'
6867
with:
6968
token: ${{ steps.generate-token.outputs.token }}
@@ -96,6 +95,12 @@ jobs:
9695
dvc ipython 'pytest>=6.0' pytest-cov \
9796
pytest-mpl sphinx-gallery tomli
9897
98+
# Pull baseline image data from dvc remote (DAGsHub)
99+
- name: Pull baseline image data from dvc remote
100+
run: |
101+
dvc pull
102+
ls -lhR pygmt/tests/baseline/
103+
99104
# Build and install latest GMT from GitHub
100105
- name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS)
101106
run: curl https://raw.githubusercontent.com/GenericMappingTools/gmt/master/ci/build-gmt.sh | bash
@@ -110,7 +115,7 @@ jobs:
110115

111116
# Download cached remote files (artifacts) from GitHub
112117
- name: Download remote data from GitHub
113-
uses: dawidd6/action-download-artifact@v2.16.0
118+
uses: dawidd6/action-download-artifact@v2.17.0
114119
with:
115120
workflow: cache_data.yaml
116121
workflow_conclusion: success
@@ -126,11 +131,6 @@ jobs:
126131
touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
127132
ls -lhR ~/.gmt
128133
129-
# Pull baseline image data from dvc remote (DAGsHub)
130-
- name: Pull baseline image data from dvc remote
131-
run: |
132-
dvc pull
133-
ls -lhR pygmt/tests/baseline/
134134
135135
# Install the package that we want to test
136136
- name: Install the package

‎.github/workflows/dvc-diff.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

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

‎.github/workflows/format-command.yml

+2-2
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@v2.4.0
17+
- uses: actions/checkout@v3.0.0
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.pull_request.head.sha }}
2222

2323
# Setup Python environment
24-
- uses: actions/[email protected].1
24+
- uses: actions/[email protected].2
2525

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323

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

3131
- name: Set up Python
32-
uses: actions/[email protected].1
32+
uses: actions/[email protected].2
3333
with:
3434
python-version: '3.10'
3535

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

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

2121
- name: Setup data version control (DVC)
2222
uses: iterative/[email protected]
@@ -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.4.0
37+
uses: shogo82148/actions-upload-release-asset@v1.5.0
3838
with:
3939
upload_url: ${{ github.event.release.upload_url }}
4040
asset_path: baseline-images.zip

‎.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "main"
14-
- uses: release-drafter/release-drafter@v5.15.0
14+
- uses: release-drafter/release-drafter@v5.18.1
1515
with:
1616
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
1717
config-name: release-drafter.yml

‎.github/workflows/style_checks.yaml

+2-2
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@v2.4.0
19+
uses: actions/checkout@v3.0.0
2020

2121
# Setup Miniconda
2222
- name: Set up Python
23-
uses: actions/[email protected].1
23+
uses: actions/[email protected].2
2424
with:
2525
python-version: '3.10'
2626

0 commit comments

Comments
 (0)