-
Notifications
You must be signed in to change notification settings - Fork 225
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into update-baseline-images-for-gmt-dev
- Loading branch information
Showing
112 changed files
with
2,417 additions
and
626 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,10 +67,18 @@ jobs: | |
with: | ||
token: ${{ steps.generate-token.outputs.token }} | ||
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }} | ||
ref: ${{ github.event.pull_request.head.sha }} | ||
ref: ${{ github.event.client_payload.pull_request.head.ref }} | ||
# fecth all history so that setuptools-scm works | ||
fetch-depth: 0 | ||
|
||
- name: Show job URL | ||
uses: peter-evans/[email protected] | ||
if: github.event_name == 'repository_dispatch' && (matrix.os == 'ubuntu-latest') | ||
with: | ||
token: ${{ steps.generate-token.outputs.token }} | ||
repository: ${{ github.event.client_payload.github.payload.repository.full_name }} | ||
comment-id: ${{ github.event.client_payload.github.payload.comment.id }} | ||
|
||
# Install Mambaforge with conda-forge dependencies | ||
- name: Setup Mambaforge | ||
uses: conda-incubator/[email protected] | ||
|
@@ -92,14 +100,18 @@ jobs: | |
geopandas ghostscript libnetcdf hdf5 zlib curl pcre make | ||
pip install --pre --prefer-binary \ | ||
numpy pandas xarray netCDF4 packaging \ | ||
dvc ipython 'pytest>=6.0' pytest-cov \ | ||
pytest-mpl sphinx-gallery tomli | ||
build dvc ipython 'pytest>=6.0' pytest-cov \ | ||
pytest-doctestplus pytest-mpl sphinx-gallery tomli | ||
# Pull baseline image data from dvc remote (DAGsHub) | ||
- name: Pull baseline image data from dvc remote | ||
run: | | ||
ORIGINAL_BRANCH=$(git branch --show-current) | ||
# Pull down GMT 6.4 baseline images from the gmt-6.4 branch | ||
git checkout gmt-6.4 | ||
dvc pull | ||
ls -lhR pygmt/tests/baseline/ | ||
git checkout ${ORIGINAL_BRANCH} | ||
# Build and install latest GMT from GitHub | ||
- name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) | ||
|
@@ -131,11 +143,10 @@ jobs: | |
touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt | ||
ls -lhR ~/.gmt | ||
# Install the package that we want to test | ||
- name: Install the package | ||
run: | | ||
python setup.py sdist --formats=zip | ||
python -m build --sdist | ||
pip install dist/* | ||
- name: Add GMT's bin to PATH (Linux/macOS) | ||
|
@@ -156,17 +167,8 @@ jobs: | |
|
||
# Upload diff images on test failure | ||
- name: Upload diff images if any test fails | ||
uses: actions/upload-artifact@v2 | ||
uses: actions/upload-artifact@v3 | ||
if: ${{ failure() }} | ||
with: | ||
name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }} | ||
path: tmp-test-dir-with-unique-name | ||
|
||
- name: Add reaction | ||
uses: peter-evans/create-or-update-comment@v1 | ||
if: github.event_name == 'repository_dispatch' | ||
with: | ||
token: ${{ steps.generate-token.outputs.token }} | ||
repository: ${{ github.event.client_payload.github.payload.repository.full_name }} | ||
comment-id: ${{ github.event.client_payload.github.payload.comment.id }} | ||
reaction-type: hooray |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.