Skip to content

Commit

Permalink
Merge branch 'main' into refactor/load_remote_dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
seisman authored Apr 22, 2024
2 parents baacd32 + 11a1bc1 commit 6f75d9f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/release-baseline-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'GenericMappingTools/pygmt'

permissions:
# To write assets to GitHub release
contents: write

steps:
- name: Checkout
uses: actions/[email protected]
Expand All @@ -35,7 +39,6 @@ jobs:
shasum -a 256 baseline-images.zip
- name: Upload baseline image as a release asset
uses: shogo82148/[email protected]
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: baseline-images.zip
run: gh release upload ${{ github.ref_name }} baseline-images.zip
env:
GH_TOKEN: ${{ github.token }}
12 changes: 11 additions & 1 deletion pygmt/helpers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import subprocess
import sys
import time
import warnings
import webbrowser
from collections.abc import Iterable, Sequence
from typing import Any
Expand Down Expand Up @@ -439,6 +440,10 @@ def build_arg_string(kwdict, confdict=None, infile=None, outfile=None):
strings (e.g. "+proj=longlat +datum=WGS84") will have their spaces removed.
See https://github.com/GenericMappingTools/pygmt/pull/1487 for more info.
.. deprecated:: 0.12.0
Use :func:`build_arg_list` instead.
Parameters
----------
kwdict : dict
Expand Down Expand Up @@ -513,8 +518,13 @@ def build_arg_string(kwdict, confdict=None, infile=None, outfile=None):
... )
input.txt -A0 -B -Crainbow --FORMAT_DATE_MAP="o dd" ->output.txt
"""
gmt_args = []
msg = (
"Utility function 'build_arg_string()' is deprecated in v0.12.0 and will be "
"removed in v0.14.0. Use 'build_arg_list()' instead."
)
warnings.warn(msg, category=FutureWarning, stacklevel=2)

gmt_args = []
for key in kwdict:
if len(key) > 2: # raise an exception for unrecognized options
raise GMTInvalidInput(f"Unrecognized parameter '{key}'.")
Expand Down

0 comments on commit 6f75d9f

Please sign in to comment.