Skip to content

Commit 850ac31

Browse files
authored
Merge branch 'main' into to_numpy/pandas_datetime
2 parents ce3de3e + 351247d commit 850ac31

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

.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/setup-micromamba@v2.0.2
48+
uses: mamba-org/setup-micromamba@v2.0.3
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/setup-micromamba@v2.0.2
46+
uses: mamba-org/setup-micromamba@v2.0.3
4747
with:
4848
environment-name: pygmt
4949
condarc: |

.github/workflows/ci_docs.yml

Lines changed: 1 addition & 1 deletion
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/setup-micromamba@v2.0.2
83+
uses: mamba-org/setup-micromamba@v2.0.3
8484
with:
8585
environment-name: pygmt
8686
condarc: |

.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 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/setup-micromamba@v2.0.2
45+
uses: mamba-org/setup-micromamba@v2.0.3
4646
with:
4747
environment-name: pygmt
4848
condarc: |

.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
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
7777
# Python 3.12 + core packages (latest versions) + optional packages
7878
- python-version: '3.12'
79-
numpy-version: '2.1'
79+
numpy-version: '2.2'
8080
pandas-version: ''
8181
xarray-version: ''
8282
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
@@ -113,7 +113,7 @@ jobs:
113113

114114
# Install Micromamba with conda-forge dependencies
115115
- name: Setup Micromamba
116-
uses: mamba-org/setup-micromamba@v2.0.2
116+
uses: mamba-org/setup-micromamba@v2.0.3
117117
with:
118118
environment-name: pygmt
119119
condarc: |

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
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/setup-micromamba@v2.0.2
60+
uses: mamba-org/setup-micromamba@v2.0.3
6161
with:
6262
environment-name: pygmt
6363
condarc: |

.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 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/setup-micromamba@v2.0.2
54+
uses: mamba-org/setup-micromamba@v2.0.3
5555
with:
5656
environment-name: pygmt
5757
condarc: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ jobs:
7575
ls -lh dist/
7676
7777
- name: Publish to Test PyPI
78-
uses: pypa/gh-action-pypi-publish@v1.12.2
78+
uses: pypa/gh-action-pypi-publish@v1.12.3
7979
with:
8080
repository-url: https://test.pypi.org/legacy/
8181

8282
- name: Publish to PyPI
8383
if: startsWith(github.ref, 'refs/tags')
84-
uses: pypa/gh-action-pypi-publish@v1.12.2
84+
uses: pypa/gh-action-pypi-publish@v1.12.3

0 commit comments

Comments
 (0)