Skip to content

Commit d5a671a

Browse files
committed
Merge branch 'main' into alias-system
2 parents a318d4b + 1478fa2 commit d5a671a

Some content is hidden

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

67 files changed

+499
-311
lines changed

.github/ISSUE_TEMPLATE/1-bug_report.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
name: Bug report
2-
description: Report a problem/bug to help us improve
2+
description: Report a problem/bug to help us improve.
33
labels: bug
44
body:
55
- type: markdown
66
attributes:
7-
value: |
7+
value: >
88
Thanks for taking the time to fill out this bug report!
99
- type: textarea
1010
attributes:
1111
label: "Description of the problem"
12-
description: |
12+
description: >
1313
Please be as detailed as you can when describing an issue.
1414
The more information we have, the easier it will be for us to track this down.
1515
validations:
1616
required: true
1717
- type: textarea
1818
attributes:
1919
label: "Minimal Complete Verifiable Example"
20-
description: |
20+
description: >
2121
So that we can understand and fix the issue quickly and efficiently, please provide
2222
a minimal, self-contained copy-pastable example that demonstrates the issue.
23+
2324
For more details, check out:
2425
2526
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
27+
2628
- [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
2729
2830
placeholder: "PASTE CODE HERE"
@@ -40,9 +42,11 @@ body:
4042
- type: textarea
4143
attributes:
4244
label: "System information"
43-
description: |
44-
Please paste the output of `python -c "import pygmt; pygmt.show_versions()"`
45-
If this command is not successful, please describe your operating system, how you installed PyGMT, how you installed GMT, and paste the full error message.
45+
description: >
46+
Please paste the output of `python -c "import pygmt; pygmt.show_versions()"`.
47+
48+
If this command is not successful, please describe your operating system,
49+
how you installed PyGMT, how you installed GMT, and paste the full error message.
4650
placeholder: "PASTE THE OUTPUT HERE"
4751
render: bash
4852
validations:

.github/ISSUE_TEMPLATE/2-feature_request.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ body:
55
- type: textarea
66
attributes:
77
label: "Description of the desired feature"
8-
description: |
9-
Please be as detailed as you can in your description.
10-
If possible, include an example of how you would like to use this feature (even better if it's a code example).
8+
description: >
9+
Please be as detailed as you can in your description. If possible, include
10+
an example of how you would like to use this feature (even better if it's a code example).
1111
- type: dropdown
1212
id: help
1313
attributes:
1414
label: Are you willing to help implement and maintain this feature?
15-
description: |
16-
Every feature we add is code that we will have to maintain and keep updated. This takes a lot of effort.
17-
If you are willing to be involved in the project and help maintain your feature, it will make it easier for us to accept it.
15+
description: >
16+
Every feature we add is code that we will have to maintain and keep updated.
17+
This takes a lot of effort. If you are willing to be involved in the project and
18+
help maintain your feature, it will make it easier for us to accept it.
1819
options:
1920
- "No"
2021
- "Yes"

.github/ISSUE_TEMPLATE/3-module_request.yaml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,29 @@ labels: ["feature request"]
55
body:
66
- type: markdown
77
attributes:
8-
value: |
9-
Please replace `<module-name>` in the issue title and the description with the name of the requested module and add the description of the module.
8+
value: >
9+
Please replace `<module-name>` in the issue title and the description with the
10+
name of the requested module and add the description of the module.
1011
- type: textarea
1112
id: which-module
1213
attributes:
1314
label: Description of the desired module
14-
description: Please be as detailed as you can in your description. If possible, include an example of how you would like to use this feature (even better if it's a code example).
15-
placeholder: Implement [`<module-name>`](https://docs.generic-mapping-tools.org/latest/<module-name>.html) which `<insert description of the GMT module>`.
15+
description: >
16+
Please be as detailed as you can in your description. If possible, include
17+
an example of how you would like to use this feature (even better if it's a code example).
18+
placeholder: >
19+
Implement [`<module-name>`](https://docs.generic-mapping-tools.org/latest/<module-name>.html)
20+
which `<insert description of the GMT module>`.
1621
validations:
1722
required: true
1823
- type: dropdown
1924
id: help
2025
attributes:
2126
label: Are you willing to help implement and maintain this feature?
22-
description: |
23-
Every feature we add is code that we will have to maintain and keep updated. This takes a lot of effort.
24-
If you are willing to be involved in the project and help maintain your feature, it will make it easier for us to accept it.
27+
description: >
28+
Every feature we add is code that we will have to maintain and keep updated.
29+
This takes a lot of effort. If you are willing to be involved in the project and
30+
help maintain your feature, it will make it easier for us to accept it.
2531
options:
2632
- "No"
2733
- "Yes"
@@ -30,5 +36,6 @@ body:
3036
required: true
3137
- type: markdown
3238
attributes:
33-
value: |
34-
Progress on wrapping the module will be tracked in the [project board](https://github.com/GenericMappingTools/pygmt/projects/9).
39+
value: >
40+
Progress on wrapping the module will be tracked in the
41+
[project board](https://github.com/orgs/GenericMappingTools/projects/3).

.github/workflows/benchmarks.yml

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

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/[email protected].1
48+
uses: mamba-org/[email protected].2
4949
with:
5050
environment-name: pygmt
5151
condarc: |

.github/workflows/cache_data.yaml

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

4444
# Install Micromamba with conda-forge dependencies
4545
- name: Setup Micromamba
46-
uses: mamba-org/[email protected].1
46+
uses: mamba-org/[email protected].2
4747
with:
4848
environment-name: pygmt
4949
condarc: |

.github/workflows/ci_docs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/[email protected].1
83+
uses: mamba-org/[email protected].2
8484
with:
8585
environment-name: pygmt
8686
condarc: |
@@ -104,13 +104,14 @@ jobs:
104104
geopandas<1.0
105105
ipython
106106
pyarrow
107+
rasterio<1.4.3
107108
rioxarray
108109
make
109110
pip
110111
python-build
111112
myst-nb
112113
panel
113-
sphinx
114+
sphinx>=6.2
114115
sphinx-autodoc-typehints
115116
sphinx-copybutton
116117
sphinx-design

.github/workflows/ci_doctests.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Install Micromamba with conda-forge dependencies
4444
- name: Setup Micromamba
45-
uses: mamba-org/[email protected].1
45+
uses: mamba-org/[email protected].2
4646
with:
4747
environment-name: pygmt
4848
condarc: |
@@ -61,6 +61,7 @@ jobs:
6161
geopandas
6262
ipython
6363
pyarrow
64+
rasterio<1.4.3
6465
rioxarray
6566
make
6667
pip

.github/workflows/ci_tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ jobs:
7373
numpy-version: '1.24'
7474
pandas-version: '=2.0'
7575
xarray-version: '=2023.04'
76-
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
76+
optional-packages: ' contextily geopandas<1 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
7777
# Python 3.12 + core packages (latest versions) + optional packages
7878
- python-version: '3.12'
7979
numpy-version: '2.1'
8080
pandas-version: ''
8181
xarray-version: ''
82-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
82+
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
8383
# Python 3.11 + core packages (Linux only)
8484
- os: 'ubuntu-latest'
8585
python-version: '3.11'
@@ -113,7 +113,7 @@ jobs:
113113

114114
# Install Micromamba with conda-forge dependencies
115115
- name: Setup Micromamba
116-
uses: mamba-org/[email protected].1
116+
uses: mamba-org/[email protected].2
117117
with:
118118
environment-name: pygmt
119119
condarc: |
@@ -176,7 +176,7 @@ jobs:
176176

177177
# Upload coverage to Codecov
178178
- name: Upload coverage to Codecov
179-
uses: codecov/[email protected].3
179+
uses: codecov/[email protected].7
180180
if: success() || failure()
181181
with:
182182
use_oidc: true

.github/workflows/ci_tests_dev.yaml

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

5858
# Install Micromamba with conda-forge dependencies
5959
- name: Setup Micromamba
60-
uses: mamba-org/[email protected].1
60+
uses: mamba-org/[email protected].2
6161
with:
6262
environment-name: pygmt
6363
condarc: |
@@ -152,7 +152,7 @@ jobs:
152152
python -m pip install --pre --prefer-binary \
153153
--extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
154154
numpy pandas xarray netCDF4 packaging \
155-
build contextily dvc geopandas ipython pyarrow rioxarray \
155+
build contextily dvc geopandas ipython pyarrow 'rasterio<1.4.3' rioxarray \
156156
pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \
157157
sphinx-gallery
158158

.github/workflows/ci_tests_legacy.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
# Install Micromamba with conda-forge dependencies
5353
- name: Setup Micromamba
54-
uses: mamba-org/[email protected].1
54+
uses: mamba-org/[email protected].2
5555
with:
5656
environment-name: pygmt
5757
condarc: |
@@ -71,6 +71,7 @@ jobs:
7171
geopandas
7272
ipython
7373
pyarrow
74+
rasterio<1.4.3
7475
rioxarray
7576
sphinx-gallery
7677
make

0 commit comments

Comments
 (0)