Skip to content

Commit 3c8a1ce

Browse files
seismanseisman
authored
Merge branch 'main' into refactor-meca
2 parents 3b751c1 + e5f5da9 commit 3c8a1ce

Some content is hidden

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

55 files changed

+629
-300
lines changed

‎.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Checkout
2222
uses: actions/[email protected]
2323
with:
24-
# fecth all history so that setuptools-scm works
24+
# fetch all history so that setuptools-scm works
2525
fetch-depth: 0
2626

2727
# Install Mambaforge with conda-forge dependencies

‎.github/workflows/check-links.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
4545
--exclude "^https://hackmd.io/@pygmt"
4646
--exclude "^https://doi.org"
47+
--exclude "^https://www.researchgate.net/project/"
4748
--verbose
4849
"repository/**/*.rst"
4950
"repository/**/*.md"

‎.github/workflows/ci_docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
steps:
4444
# Cancel previous runs that are not completed
4545
- name: Cancel Previous Runs
46-
uses: styfle/cancel-workflow-action@0.9.1
46+
uses: styfle/cancel-workflow-action@0.10.0
4747
with:
4848
access_token: ${{ github.token }}
4949

5050
# Checkout current git repository
5151
- name: Checkout
5252
uses: actions/[email protected]
5353
with:
54-
# fecth all history so that setuptools-scm works
54+
# fetch all history so that setuptools-scm works
5555
fetch-depth: 0
5656

5757
# Install Mambaforge with conda-forge dependencies
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Download cached remote files (artifacts) from GitHub
8282
- name: Download remote data from GitHub
83-
uses: dawidd6/[email protected].0
83+
uses: dawidd6/[email protected].1
8484
with:
8585
workflow: cache_data.yaml
8686
workflow_conclusion: success

‎.github/workflows/ci_tests.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,17 @@ jobs:
3434
# Is it a draft Pull Request (true or false)?
3535
isDraft:
3636
- ${{ github.event.pull_request.draft }}
37-
# Only run one job (Ubuntu + Python 3.10) for draft PRs
37+
# Only run two jobs (Ubuntu + Python 3.8/3.10) for draft PRs
3838
exclude:
3939
- os: macOS-latest
4040
isDraft: true
4141
- os: windows-latest
4242
isDraft: true
43-
# - os: ubuntu-latest
44-
# python-version: 3.7
45-
# isDraft: true
46-
# Pair Python 3.8 with NumPy 1.19 and Python 3.10 with NumPy 1.22
43+
# Pair Python 3.8 with NumPy 1.20 and Python 3.10 with NumPy 1.22
4744
# Only install optional packages on Python 3.10/NumPy 1.22
4845
include:
4946
- python-version: '3.8'
50-
numpy-version: '1.19'
47+
numpy-version: '1.20'
5148
optional-packages: ''
5249
- python-version: '3.10'
5350
numpy-version: '1.22'
@@ -66,15 +63,15 @@ jobs:
6663
steps:
6764
# Cancel previous runs that are not completed
6865
- name: Cancel Previous Runs
69-
uses: styfle/cancel-workflow-action@0.9.1
66+
uses: styfle/cancel-workflow-action@0.10.0
7067
with:
7168
access_token: ${{ github.token }}
7269

7370
# Checkout current git repository
7471
- name: Checkout
7572
uses: actions/[email protected]
7673
with:
77-
# fecth all history so that setuptools-scm works
74+
# fetch all history so that setuptools-scm works
7875
fetch-depth: 0
7976

8077
# Install Mambaforge with conda-forge dependencies
@@ -105,7 +102,7 @@ jobs:
105102

106103
# Download cached remote files (artifacts) from GitHub
107104
- name: Download remote data from GitHub
108-
uses: dawidd6/[email protected].0
105+
uses: dawidd6/[email protected].1
109106
with:
110107
workflow: cache_data.yaml
111108
workflow_conclusion: success

‎.github/workflows/ci_tests_dev.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
python-version: ['3.10']
32-
os: [ubuntu-latest, macOS-11.0, windows-2022]
32+
os: [ubuntu-22.04, macOS-12, windows-2022]
3333
gmt_git_ref: [master]
3434
timeout-minutes: 30
3535
defaults:
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040
# Cancel previous runs that are not completed
4141
- name: Cancel Previous Runs
42-
uses: styfle/cancel-workflow-action@0.9.1
42+
uses: styfle/cancel-workflow-action@0.10.0
4343
with:
4444
access_token: ${{ github.token }}
4545

@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/[email protected]
4949
if: github.event_name != 'repository_dispatch'
5050
with:
51-
# fecth all history so that setuptools-scm works
51+
# fetch all history so that setuptools-scm works
5252
fetch-depth: 0
5353

5454
# Generate token from GenericMappingTools bot
@@ -68,7 +68,7 @@ jobs:
6868
token: ${{ steps.generate-token.outputs.token }}
6969
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
7070
ref: ${{ github.event.client_payload.pull_request.head.ref }}
71-
# fecth all history so that setuptools-scm works
71+
# fetch all history so that setuptools-scm works
7272
fetch-depth: 0
7373

7474
- name: Show job URL
@@ -137,7 +137,7 @@ jobs:
137137

138138
# Download cached remote files (artifacts) from GitHub
139139
- name: Download remote data from GitHub
140-
uses: dawidd6/[email protected].0
140+
uses: dawidd6/[email protected].1
141141
with:
142142
workflow: cache_data.yaml
143143
workflow_conclusion: success

‎.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ref: ${{ github.event.client_payload.pull_request.head.ref }}
2222

2323
# Setup Python environment
24-
- uses: actions/setup-python@v3.1.2
24+
- uses: actions/setup-python@v4.0.0
2525

2626
# Install formatting tools
2727
- name: Install formatting tools

‎.github/workflows/publish-to-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v3.1.2
32+
uses: actions/setup-python@v4.0.0
3333
with:
3434
python-version: '3.10'
3535

‎.github/workflows/style_checks.yaml

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

2121
# Setup Miniconda
2222
- name: Set up Python
23-
uses: actions/setup-python@v3.1.2
23+
uses: actions/setup-python@v4.0.0
2424
with:
2525
python-version: '3.10'
2626

‎AUTHORS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ The following people have contributed code and/or documentation to the project
99
(alphabetical by name) and are considered to be "PyGMT Developers":
1010

1111
* [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated
12+
* [Andre L. Belem](https://github.com/andrebelem) | [0000-0002-8865-6180](https://orcid.org/0000-0002-8865-6180) | Fluminense Federal University, Brazil
1213
* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China
1314
* [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom
1415
* [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore
1516
* [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA
1617
* [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom
1718
* [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA
1819
* [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany
19-
* [Meghan Jones](https://github.com/meghanrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA
20+
* [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA
2021
* [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | Innoplexia GmbH, Germany
2122
* [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA
2223
* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | The Ohio State University, USA
2324
* [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated
2425
* [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel
26+
* [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Karlsruhe Institute of Technology, Germany

‎CITATION.cff

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ authors:
1616
family-names: Leong
1717
affiliation: The Ohio State University, USA
1818
orcid: https://orcid.org/0000-0003-2354-1988
19-
- given-names: Meghan
19+
- given-names: Max
2020
family-names: Jones
2121
affiliation: University of Hawai'i at Mānoa, USA
2222
orcid: https://orcid.org/0000-0003-0180-8928
@@ -44,6 +44,14 @@ authors:
4444
family-names: Materna
4545
affiliation: US Geological Survey, USA
4646
orcid: https://orcid.org/0000-0002-6687-980X
47+
- given-names: Yvonne
48+
family-names: Fröhlich
49+
affiliation: Karlsruhe Institute of Technology, Germany
50+
orcid: https://orcid.org/0000-0002-8566-0619
51+
- given-names: Andre
52+
family-names: Belem
53+
affiliation: Fluminense Federal University, Brazil
54+
orcid: https://orcid.org/0000-0002-8865-6180
4755
- given-names: Tyler
4856
family-names: Newton
4957
affiliation: University of Oregon, USA
@@ -64,9 +72,9 @@ authors:
6472
family-names: Wessel
6573
affiliation: University of Hawai'i at Mānoa, USA
6674
orcid: https://orcid.org/0000-0001-5708-7336
67-
date-released: 2022-04-11
68-
doi: 10.5281/zenodo.6426493
75+
date-released: 2022-07-01
76+
doi: 10.5281/zenodo.6702566
6977
license: BSD-3-Clause
7078
repository-code: https://github.com/GenericMappingTools/pygmt
7179
type: software
72-
version: 0.6.1
80+
version: 0.7.0

‎CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ representative at an online or offline event.
6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement
6363
by contacting [Leonardo Uieda](http://www.leouieda.com) (preferred) or
64-
[Meghan Jones](https://www.soest.hawaii.edu/soestwp/about/directory/meghan-jones/).
64+
[Max Jones](https://forum.generic-mapping-tools.org/u/maxrjones).
6565
All complaints will be reviewed and investigated promptly and fairly.
6666

6767
All community leaders are obligated to respect the privacy and security of the

‎README.rst

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ Simple installation using `conda <https://docs.conda.io/projects/conda/en/latest
8686

8787
conda install --channel conda-forge pygmt
8888

89+
If you use `mamba <https://mamba.readthedocs.org/>`__::
90+
91+
mamba install --channel conda-forge pygmt
92+
8993
For other ways to install ``pygmt``, see `full installation instructions <https://www.pygmt.org/latest/install.html>`__.
9094

9195

@@ -152,11 +156,11 @@ Developers". Feel free to cite our work in your research using the following Bib
152156

153157
.. code-block::
154158
155-
@software{pygmt_2022_6426493,
159+
@software{pygmt_2022_6702566,
156160
author = {Uieda, Leonardo and
157161
Tian, Dongdong and
158162
Leong, Wei Ji and
159-
Jones, Meghan and
163+
Jones, Max and
160164
Schlitzer, William and
161165
Grund, Michael and
162166
Toney, Liam and
@@ -169,12 +173,12 @@ Developers". Feel free to cite our work in your research using the following Bib
169173
Quinn, Jamie and
170174
Wessel, Paul},
171175
title = {{PyGMT: A Python interface for the Generic Mapping Tools}},
172-
month = apr,
176+
month = jul,
173177
year = 2022,
174178
publisher = {Zenodo},
175-
version = {v0.6.1},
176-
doi = {10.5281/zenodo.6426493},
177-
url = {https://doi.org/10.5281/zenodo.6426493}
179+
version = {v0.7.0},
180+
doi = {10.5281/zenodo.6702566},
181+
url = {https://doi.org/10.5281/zenodo.6702566}
178182
}
179183
180184
To cite a specific version of PyGMT, go to our Zenodo page at
@@ -231,8 +235,13 @@ Compatibility with GMT/Python/NumPy versions
231235
- `Dev Documentation <https://www.pygmt.org/dev>`_ (reflects `main branch <https://github.com/GenericMappingTools/pygmt>`_)
232236
- >=6.3.0
233237
- >=3.8
234-
- >=1.19
235-
* - `v0.6.1 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.6.1>`_ (latest release)
238+
- >=1.20
239+
* - `v0.7.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.7.0>`_ (latest release)
240+
- `v0.7.0 Documentation <https://www.pygmt.org/v0.7.0>`_
241+
- >=6.3.0
242+
- >=3.8
243+
- >=1.20
244+
* - `v0.6.1 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.6.1>`_
236245
- `v0.6.1 Documentation <https://www.pygmt.org/v0.6.1>`_
237246
- >=6.3.0
238247
- >=3.8

‎doc/_static/version_switch.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var all_versions = {
1313
'latest': 'latest',
1414
'dev': 'dev',
15+
'v0.7.0': 'v0.7.0',
1516
'v0.6.1': 'v0.6.1',
1617
'v0.6.0': 'v0.6.0',
1718
'v0.5.0': 'v0.5.0',

‎doc/_templates/breadcrumbs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block breadcrumbs_aside %}
66
<li class="source-link">
77
{% if hasdoc(pagename) %}
8-
{% if pagename.startswith("api/generated") or suffix == ".ipynb" %}
8+
{% if pagename.startswith("api/generated") or page_source_suffix == ".ipynb" %}
99
{% set title = "Suggested improvement for " + pagename %}
1010
{% set body = "Please describe what could be improved about this page or the typo/mistake that you found:" %}
1111
<a href="https://github.com/{{ github_repo }}/issues/new?title={{ title|urlencode }}&body={{ body|urlencode }}"
@@ -21,7 +21,7 @@
2121
<a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ example_script }}"
2222
class="fa fa-github"> Improve this page</a>
2323
{% else %}
24-
<a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ pagename }}{{ suffix }}"
24+
<a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ pagename }}{{ page_source_suffix }}"
2525
class="fa fa-github"> Improve this page</a>
2626
{% endif %}
2727
{% endif %}

‎doc/api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Operations on tabular data
114114
.. autosummary::
115115
:toctree: generated
116116

117+
binstats
117118
blockmean
118119
blockmedian
119120
blockmode

0 commit comments

Comments
 (0)