Skip to content

Commit 11101b5

Browse files
committed
Merge branch 'master' into test-basemap
2 parents 23a0c81 + 0e64122 commit 11101b5

25 files changed

+74
-179
lines changed

.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
# Setup Miniconda
2121
- name: Setup Miniconda
22-
uses: conda-incubator/setup-miniconda@v2.0.1
22+
uses: conda-incubator/setup-miniconda@v2.1.0
2323
with:
2424
channels: conda-forge
2525
miniconda-version: "latest"

.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
# Setup Miniconda
5858
- name: Setup Miniconda
59-
uses: conda-incubator/setup-miniconda@v2.0.1
59+
uses: conda-incubator/setup-miniconda@v2.1.0
6060
with:
6161
activate-environment: pygmt
6262
python-version: ${{ matrix.python-version }}
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
conda install gmt=6.1.1 numpy pandas xarray netCDF4 packaging \
7070
ipython make myst-parser \
71-
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme=0.4.3
71+
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme=0.5.1
7272
7373
# Show installed pkg information for postmortem diagnostic
7474
- name: List installed packages

.github/workflows/ci_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676

7777
# Setup Miniconda
7878
- name: Setup Miniconda
79-
uses: conda-incubator/setup-miniconda@v2.0.1
79+
uses: conda-incubator/setup-miniconda@v2.1.0
8080
with:
8181
activate-environment: pygmt
8282
python-version: ${{ matrix.python-version }}
@@ -140,7 +140,7 @@ jobs:
140140

141141
# Upload coverage to Codecov
142142
- name: Upload coverage to Codecov
143-
uses: codecov/codecov-action@v1.2.2
143+
uses: codecov/codecov-action@v1.3.1
144144
with:
145145
file: ./coverage.xml # optional
146146
env_vars: OS,PYTHON,NUMPY

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
# Setup Miniconda
7575
- name: Setup Miniconda
76-
uses: conda-incubator/setup-miniconda@v2.0.1
76+
uses: conda-incubator/setup-miniconda@v2.1.0
7777
with:
7878
activate-environment: pygmt
7979
python-version: ${{ matrix.python-version }}

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ dependencies:
3232
- sphinx
3333
- sphinx-copybutton
3434
- sphinx-gallery
35-
- sphinx_rtd_theme=0.4.3
35+
- sphinx_rtd_theme=0.5.1

pygmt/helpers/decorators.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
region : str or list
1818
*Required if this is the first plot command*.
1919
*xmin/xmax/ymin/ymax*\ [**+r**][**+u**\ *unit*].
20-
Specify the region of interest.""",
20+
Specify the :doc:`region </tutorials/regions>` of interest.""",
2121
"J": r"""
2222
projection : str
2323
*Required if this is the first plot command*.
2424
*projcode*\[*projparams*/]\ *width*.
2525
Select map :doc:`projection </projections/index>`.""",
2626
"B": r"""
2727
frame : bool or str or list
28-
Set map boundary frame and axes attributes.""",
28+
Set map boundary
29+
:doc:`frame and axes attributes </tutorials/frames>`. """,
2930
"U": """\
3031
timestamp : bool or str
3132
Draw GMT time stamp logo on plot.""",
@@ -201,7 +202,7 @@ def fmt_docstring(module_func):
201202
region : str or list
202203
*Required if this is the first plot command*.
203204
*xmin/xmax/ymin/ymax*\ [**+r**][**+u**\ *unit*].
204-
Specify the region of interest.
205+
Specify the :doc:`region </tutorials/regions>` of interest.
205206
projection : str
206207
*Required if this is the first plot command*.
207208
*projcode*\[*projparams*/]\ *width*.
-133 KB
Binary file not shown.
-184 KB
Binary file not shown.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 30c3f4c90ba740b7d9edae97d9d3b853
3+
size: 93411
4+
path: test_coast_dcw_list.png
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 40fcf70e1f73ba2be60cbf9e3f15794d
3+
size: 83794
4+
path: test_coast_dcw_single.png

0 commit comments

Comments
 (0)