Skip to content

Commit

Permalink
Merge branch 'main' into spec0/gmt
Browse files Browse the repository at this point in the history
  • Loading branch information
seisman authored Oct 2, 2024
2 parents 5ab519c + a7e474c commit 530013f
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
path: repository

- name: Checkout the documentation
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: gh-pages
path: documentation
Expand Down
4 changes: 2 additions & 2 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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
run: make -C doc clean all

- name: Checkout the gh-pages branch
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: gh-pages
# Checkout to this folder instead of the current one
Expand Down
2 changes: 1 addition & 1 deletion .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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:

# Upload coverage to Codecov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v4.6.0
if: success() || failure()
with:
use_oidc: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
# Checkout current GMT repository
- name: Checkout the GMT source from ${{ matrix.gmt_git_ref }} branch
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
repository: 'GenericMappingTools/gmt'
ref: ${{ matrix.gmt_git_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that dvc diff works
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .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/checkout@v4.1.7
- uses: actions/checkout@v4.2.0
with:
token: ${{ steps.generate-token.outputs.token }}
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
Expand Down
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/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
# fetch all history so that setuptools-scm works
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-baseline-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup data version control (DVC)
uses: iterative/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

# Setup Python
- name: Set up Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/type_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
steps:
# Checkout current git repository
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

# Setup Python
- name: Set up Python
Expand Down
5 changes: 2 additions & 3 deletions pygmt/datasets/earth_day.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ def load_blue_marble(
Parameters
----------
resolution
The image resolution. The suffix ``d``, ``m``, and ``s`` stand for arc-degree,
arc-minute, and arc-second.
The image resolution. The suffix ``d``, ``m``, and ``s`` stand for arc-degrees,
arc-minutes, and arc-seconds.
region
The subregion of the image to load, in the form of a sequence [*xmin*, *xmax*,
*ymin*, *ymax*].
Expand Down
5 changes: 2 additions & 3 deletions pygmt/datasets/earth_night.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ def load_black_marble(
Parameters
----------
resolution
The image resolution. The suffix ``d``, ``m``, and ``s`` stand for arc-degree,
arc-minute, and arc-second.
The image resolution. The suffix ``d``, ``m``, and ``s`` stand for arc-degrees,
arc-minutes, and arc-seconds.
region
The subregion of the image to load, in the form of a sequence [*xmin*, *xmax*,
*ymin*, *ymax*].
Expand Down

0 comments on commit 530013f

Please sign in to comment.