Skip to content

Commit 8f1a53e

Browse files
committed
Merge branch 'master' into fix-bools
2 parents 11be35d + d105c72 commit 8f1a53e

File tree

157 files changed

+1054
-769
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1054
-769
lines changed

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Manoa.
88
The following people have contributed code and/or documentation to the project
99
(alphabetical by name) and are considered to be "PyGMT Developers":
1010

11+
* [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated
1112
* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | Michigan State University
1213
* [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University
1314
* [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,12 @@ When editing documentation, use the following standards to demonstrate the examp
181181

182182
1. Python arguments, such as import statements, Boolean expressions, and function
183183
arguments should be wrapped as ``code`` by using \`\` on both sides of the code.
184-
Example: \`\`import pygmt\`\` results in ``import pygmt``.
184+
Examples: \`\`import pygmt\`\` results in ``import pygmt``, \`\`True\`\` results in `True`,
185+
\`\`style="v"\`\` results in `style="v"`.
185186
2. Literal GMT arguments should be **bold** by wrapping the arguments with \*\*
186187
(two asterisks) on both sides. The argument description should be in *italicized*
187188
with \* (single asterisk) on both sides.
188-
Example: `**+l**\ *label*` results in **+l***label*.
189+
Examples: `**+l**\ *label*` results in **+l***label*, `**05m**` results in **05m**.
189190
3. Optional arguments are placed wrapped with [ ] (square brackets).
190191
4. Arguments that are mutually exclusive are separated with a | (bar) to denote "or".
191192

doc/conf.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,14 @@
150150
html_theme_options = {}
151151
repository = "GenericMappingTools/pygmt"
152152
repository_url = "https://github.com/GenericMappingTools/pygmt"
153-
commit_link = f'<a href="{repository_url}/commit/{ __commit__ }">{ __commit__[:8] }</a>'
153+
if __commit__:
154+
commit_link = (
155+
f'<a href="{repository_url}/commit/{ __commit__ }">{ __commit__[:8] }</a>'
156+
)
157+
else:
158+
commit_link = (
159+
f'<a href="{repository_url}/releases/tag/{ __version__ }">{ __version__ }</a>'
160+
)
154161
html_context = {
155162
"menu_links": [
156163
(

doc/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
tutorials/regions.rst
3535
tutorials/plot.rst
3636
tutorials/lines.rst
37+
tutorials/vectors.rst
3738
tutorials/text.rst
3839
tutorials/contour_map.rst
3940
tutorials/earth_relief.rst

0 commit comments

Comments
 (0)