Skip to content

Commit

Permalink
Merge branch 'main' into add-tutorial-meca
Browse files Browse the repository at this point in the history
  • Loading branch information
yvonnefroehlich authored May 2, 2024
2 parents 649bf83 + 19edbd3 commit eec5e37
Show file tree
Hide file tree
Showing 142 changed files with 1,802 additions and 1,186 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ assignees: ''
- [ ] Manually upload the pygmt-vX.Y.Z.zip and baseline-images.zip files to https://zenodo.org/deposit, ensure that it is filed under the correct reserved DOI

**After release**:
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Done automatically by conda-forge's bot, but remember to pin NEP29 versions]
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Done automatically by conda-forge's bot, but remember to pin SPEC0 versions]
- [ ] Bump PyGMT version on https://github.com/GenericMappingTools/try-gmt (after conda-forge update)
- [ ] Announce the release on:
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! draft on https://hackmd.io/@pygmt. requires moderator status)
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
# Check for updates to GitHub Actions on Tuesdays
interval: "weekly"
day: "tuesday"
# Allow up to 2 open pull requests at a time
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0

# Install Miniconda with conda-forge dependencies
- name: Setup Miniconda
uses: conda-incubator/[email protected].3
uses: conda-incubator/[email protected].4
with:
auto-activate-base: true
activate-environment: "" # base environment
Expand All @@ -64,29 +64,25 @@ jobs:
# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
touch ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Install the package that we want to test
- name: Install the package
run: make install

# Run the benchmark tests
- name: Run benchmarks
uses: CodSpeedHQ/action@v2.3.0
uses: CodSpeedHQ/action@v2.4.1
with:
run: |
python -c "import pygmt; pygmt.show_versions()"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cache_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
with:
name: gmt-cache
path: |
~/.gmt/cache
~/.gmt/server
~/.gmt/gmt_data_server.txt
~/.gmt/gmt_hash_server.txt
~/.gmt/cache
~/.gmt/server
~/.gmt/gmt_data_server.txt
~/.gmt/gmt_hash_server.txt
8 changes: 4 additions & 4 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
path: repository

- name: Checkout the documentation
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
ref: gh-pages
path: documentation

- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1.9.3
uses: lycheeverse/lychee-action@v1.10.0
with:
# 429: Too many requests
args: >
Expand Down Expand Up @@ -72,4 +72,4 @@ jobs:
title="Link Checker Report on ${{ steps.date.outputs.date }}"
gh issue create --title "$title" --body-file ./lychee/out.md
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GH_TOKEN: ${{ github.token }}
22 changes: 9 additions & 13 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -112,21 +112,17 @@ jobs:
# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
touch ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Install the package that we want to test
- name: Install the package
Expand All @@ -139,7 +135,7 @@ jobs:
run: make -C doc clean all

- name: Checkout the gh-pages branch
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
ref: gh-pages
# Checkout to this folder instead of the current one
Expand All @@ -162,7 +158,7 @@ jobs:
# to get the right commit hash.
message="Deploy $version from $(git rev-parse --short HEAD)"
cd deploy
# Need to have this file so that Github doesn't try to run Jekyll
# Need to have this file so that GitHub doesn't try to run Jekyll
touch .nojekyll
# Delete all the files and replace with our new set
echo -e "\nRemoving old files from previous builds of ${version}:"
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/ci_doctests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -71,21 +71,17 @@ jobs:
# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
touch ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Install the package that we want to test
- name: Install the package
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -128,21 +128,17 @@ jobs:
# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
touch ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Pull baseline image data from dvc remote (DAGsHub)
- name: Pull baseline image data from dvc remote
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -135,21 +135,17 @@ jobs:

# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
touch ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Install the package that we want to test
- name: Install the package
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/ci_tests_legacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -83,24 +83,20 @@ jobs:
# Download cached remote files (artifacts) from GitHub
- name: Download remote data from GitHub
uses: dawidd6/[email protected]
with:
workflow: cache_data.yaml
workflow_conclusion: success
name: gmt-cache
path: .gmt

# Move downloaded files to ~/.gmt directory and list them
- name: Move and list downloaded remote files
run: |
gh run download -n gmt-cache -D gmt-cache
# Move downloaded files to ~/.gmt directory and list them
mkdir -p ~/.gmt
mv .gmt/* ~/.gmt
mv gmt-cache/* ~/.gmt
rmdir gmt-cache
# Change modification times of the two files, so GMT won't refresh it
# The two files are in the `~/.gmt/server` directory for GMT<=6.4, and
# in the `~/.gmt` directory for GMT>=6.5.
mv ~/.gmt/gmt_data_server.txt ~/.gmt/gmt_hash_server.txt ~/.gmt/server/
touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
ls -lhR ~/.gmt
env:
GH_TOKEN: ${{ github.token }}

# Install the package that we want to test
- name: Install the package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dvc-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that dvc diff works
fetch-depth: 0
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
# Report last updated at commit abcdef
- name: Generate the image diff report
env:
repo_token: ${{ secrets.GITHUB_TOKEN }}
repo_token: ${{ github.token }}
run: |
echo -e "## Summary of changed images\n" > report.md
echo -e "This is an auto-generated report of images that have changed on the DVC remote\n" >> report.md
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/format-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
private-key: ${{ secrets.APP_PRIVATE_KEY }}

# Checkout the pull request branch
- uses: actions/[email protected].1
- uses: actions/[email protected].4
with:
token: ${{ steps.generate-token.outputs.token }}
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
Expand Down Expand Up @@ -48,11 +48,3 @@ jobs:
git commit -am "[format-command] fixes"
git push
fi
- name: Add reaction
uses: peter-evans/[email protected]
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 }}
reactions: hooray
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

steps:
- name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].4
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
Loading

0 comments on commit eec5e37

Please sign in to comment.