Skip to content

Commit 5801dd2

Browse files
weiji14weiji14
committed
Merge branch 'main' into flake8-to-flakeheaven
2 parents 942135b + 1067fa3 commit 5801dd2

Some content is hidden

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

41 files changed

+736
-211
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/checkout@v3.0.2
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
path: documentation
2727

2828
- name: Link Checker
29-
uses: lycheeverse/lychee-action@v1.4.1
29+
uses: lycheeverse/lychee-action@v1.5.0
3030
with:
3131
# 429: Too many requests
3232
args: >

‎.github/workflows/ci_docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Checkout
5252
uses: actions/checkout@v3.0.2
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
@@ -72,15 +72,15 @@ jobs:
7272
run: |
7373
mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \
7474
build ipython make myst-parser geopandas \
75-
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
75+
sphinx sphinx-copybutton sphinx-design sphinx-gallery sphinx_rtd_theme
7676
7777
# Show installed pkg information for postmortem diagnostic
7878
- name: List installed packages
7979
run: mamba list
8080

8181
# Download cached remote files (artifacts) from GitHub
8282
- name: Download remote data from GitHub
83-
uses: dawidd6/action-download-artifact@v2.19.0
83+
uses: dawidd6/action-download-artifact@v2.21.0
8484
with:
8585
workflow: cache_data.yaml
8686
workflow_conclusion: success

‎.github/workflows/ci_tests.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,12 @@ 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
4643
# Pair Python 3.8 with NumPy 1.19 and Python 3.10 with NumPy 1.22
4744
# Only install optional packages on Python 3.10/NumPy 1.22
4845
include:
@@ -74,7 +71,7 @@ jobs:
7471
- name: Checkout
7572
uses: actions/checkout@v3.0.2
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/action-download-artifact@v2.19.0
105+
uses: dawidd6/action-download-artifact@v2.21.0
109106
with:
110107
workflow: cache_data.yaml
111108
workflow_conclusion: success
@@ -133,10 +130,16 @@ jobs:
133130
python -m build --sdist
134131
pip install dist/*
135132
136-
# Run the tests
137-
- name: Test with pytest
133+
# Run the regular tests
134+
- name: Run tests
135+
if: github.event.schedule != '0 0 * * 3'
138136
run: make test PYTEST_EXTRA="-r P"
139137

138+
# Run full tests including doctests on Wednesday
139+
- name: Run full tests
140+
if: github.event_name == 'schedule' && github.event.schedule == '0 0 * * 3'
141+
run: make fulltest PYTEST_EXTRA="-r P"
142+
140143
# Upload diff images on test failure
141144
- name: Upload diff images if any test fails
142145
uses: actions/upload-artifact@v3

‎.github/workflows/ci_tests_dev.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717
- '.gitignore'
1818
repository_dispatch:
1919
types: [test-gmt-dev-command]
20-
# Schedule daily tests
20+
# Schedule tests on Monday/Wednesday/Friday
2121
schedule:
22-
- cron: '0 0 * * *'
22+
- cron: '0 0 * * 1,3,5'
2323

2424
jobs:
2525
test_gmt_dev:
@@ -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:
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/checkout@v3.0.2
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/action-download-artifact@v2.19.0
140+
uses: dawidd6/action-download-artifact@v2.21.0
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/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "main"
14-
- uses: release-drafter/release-drafter@v5.19.0
14+
- uses: release-drafter/release-drafter@v5.20.0
1515
with:
1616
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
1717
config-name: release-drafter.yml

‎.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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ The following people have contributed code and/or documentation to the project
2222
* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | The Ohio State University, USA
2323
* [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated
2424
* [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel
25+
* [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Karlsruhe Institute of Technology, Germany

0 commit comments

Comments
 (0)