-
Notifications
You must be signed in to change notification settings - Fork 224
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into remove/array-to-datetime
- Loading branch information
Showing
156 changed files
with
2,990 additions
and
943 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
|
@@ -58,14 +58,14 @@ jobs: | |
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }} | ||
create-args: >- | ||
gmt=6.5.0 | ||
python=3.12 | ||
python=3.13 | ||
numpy | ||
pandas | ||
xarray | ||
netCDF4 | ||
packaging | ||
geopandas | ||
pyarrow | ||
pyarrow-core | ||
pytest | ||
pytest-codspeed | ||
pytest-mpl | ||
|
@@ -87,7 +87,7 @@ jobs: | |
|
||
# Run the benchmark tests | ||
- name: Run benchmarks | ||
uses: CodSpeedHQ/action@v3.1.0 | ||
uses: CodSpeedHQ/action@v3.2.0 | ||
with: | ||
# 'bash -el -c' is needed to use the custom shell. | ||
# See https://github.com/CodSpeedHQ/action/issues/65. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,15 +43,15 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
channels: | ||
- conda-forge | ||
- nodefaults | ||
create-args: >- | ||
python=3.12 | ||
python=3.13 | ||
gmt=6.5.0 | ||
numpy | ||
pandas | ||
|
@@ -76,7 +76,7 @@ jobs: | |
|
||
# Upload the downloaded files as artifacts to GitHub | ||
- name: Upload artifacts to GitHub | ||
uses: actions/upload-artifact@v4.4.3 | ||
uses: actions/upload-artifact@v4.5.0 | ||
with: | ||
name: gmt-cache | ||
include-hidden-files: true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,7 +55,7 @@ jobs: | |
# Is it a draft Pull Request (true or false)? | ||
isDraft: | ||
- ${{ github.event.pull_request.draft }} | ||
# Only run one job (Ubuntu + Python 3.12) for draft PRs | ||
# Only run jobs on Ubuntu for draft PRs | ||
exclude: | ||
- os: macos-latest | ||
isDraft: true | ||
|
@@ -80,7 +80,7 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
|
@@ -92,7 +92,7 @@ jobs: | |
# environment cache is persistent for one week. | ||
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }} | ||
create-args: >- | ||
python=3.12 | ||
python=3.13 | ||
gmt=6.5.0 | ||
ghostscript=10.04.0 | ||
numpy | ||
|
@@ -101,16 +101,17 @@ jobs: | |
netCDF4 | ||
packaging | ||
contextily | ||
geopandas<1.0 | ||
geopandas | ||
ipython | ||
pyarrow | ||
pyarrow-core | ||
rioxarray | ||
make | ||
pip | ||
python-build | ||
geodatasets | ||
myst-nb | ||
panel | ||
sphinx | ||
sphinx>=6.2 | ||
sphinx-autodoc-typehints | ||
sphinx-copybutton | ||
sphinx-design | ||
|
@@ -162,9 +163,14 @@ jobs: | |
# to get the right commit hash. | ||
message="Deploy $version from $(git rev-parse --short HEAD)" | ||
cd deploy | ||
# Need to have this file so that GitHub doesn't try to run Jekyll | ||
# Create some files in the root directory. | ||
# .nojekyll: Need to have this file so that GitHub doesn't try to run Jekyll | ||
touch .nojekyll | ||
# Delete all the files and replace with our new set | ||
# CNAME: Set the custom domain name | ||
echo "www.pygmt.org" > CNAME | ||
# index.html: Redirect to the latest version | ||
echo '<meta http-equiv="Refresh" content="0;url=latest/"/>' > index.html | ||
# Delete all the files and replace with our new set | ||
echo -e "\nRemoving old files from previous builds of ${version}:" | ||
rm -rvf ${version} | ||
echo -e "\nCopying HTML files to ${version}:" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,15 +42,15 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
channels: | ||
- conda-forge | ||
- nodefaults | ||
create-args: >- | ||
python=3.12 | ||
python=3.13 | ||
gmt=6.5.0 | ||
numpy | ||
pandas | ||
|
@@ -60,7 +60,7 @@ jobs: | |
contextily | ||
geopandas | ||
ipython | ||
pyarrow | ||
pyarrow-core | ||
rioxarray | ||
make | ||
pip | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,7 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
python-version: ['3.10', '3.12'] | ||
python-version: ['3.11', '3.13'] | ||
os: [ubuntu-latest, macos-latest, windows-latest] | ||
# Is it a draft Pull Request (true or false)? | ||
isDraft: | ||
|
@@ -68,21 +68,21 @@ jobs: | |
- os: windows-latest | ||
isDraft: true | ||
include: | ||
# Python 3.10 + core packages (minimum supported versions) + optional packages (minimum supported versions if any) | ||
- python-version: '3.10' | ||
numpy-version: '1.24' | ||
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any) | ||
- python-version: '3.11' | ||
numpy-version: '1.25' | ||
pandas-version: '=2.0' | ||
xarray-version: '=2023.04' | ||
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery' | ||
# Python 3.12 + core packages (latest versions) + optional packages | ||
- python-version: '3.12' | ||
numpy-version: '2.1' | ||
optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery' | ||
# Python 3.13 + core packages (latest versions) + optional packages | ||
- python-version: '3.13' | ||
numpy-version: '2.2' | ||
pandas-version: '' | ||
xarray-version: '' | ||
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery' | ||
# Python 3.11 + core packages (Linux only) | ||
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery' | ||
# Python 3.12 + core packages (Linux only) | ||
- os: 'ubuntu-latest' | ||
python-version: '3.11' | ||
python-version: '3.12' | ||
numpy-version: '' | ||
pandas-version: '' | ||
xarray-version: '' | ||
|
@@ -113,7 +113,7 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
|
@@ -133,7 +133,6 @@ jobs: | |
xarray${{ matrix.xarray-version }} | ||
netCDF4 | ||
packaging | ||
dvc | ||
make | ||
pip | ||
python-build | ||
|
@@ -154,9 +153,19 @@ jobs: | |
env: | ||
GH_TOKEN: ${{ github.token }} | ||
|
||
- name: Install uv | ||
uses: astral-sh/[email protected] | ||
with: | ||
python-version: ${{ matrix.python-version }} | ||
|
||
- name: Install dvc | ||
run: | | ||
uv pip install dvc | ||
uv pip list | ||
# Pull baseline image data from dvc remote (DAGsHub) | ||
- name: Pull baseline image data from dvc remote | ||
run: dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/ | ||
run: uv run dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/ | ||
|
||
# Install the package that we want to test | ||
- name: Install the package | ||
|
@@ -168,15 +177,15 @@ jobs: | |
|
||
# Upload diff images on test failure | ||
- name: Upload diff images if any test fails | ||
uses: actions/upload-artifact@v4.4.3 | ||
uses: actions/upload-artifact@v4.5.0 | ||
if: failure() | ||
with: | ||
name: artifact-${{ runner.os }}-${{ matrix.python-version }} | ||
path: tmp-test-dir-with-unique-name | ||
|
||
# Upload coverage to Codecov | ||
- name: Upload coverage to Codecov | ||
uses: codecov/codecov-action@v5.0.7 | ||
uses: codecov/codecov-action@v5.1.2 | ||
if: success() || failure() | ||
with: | ||
use_oidc: true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,7 +36,7 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ubuntu-24.04, macos-15, windows-2022] | ||
os: [ubuntu-24.04, macos-15, windows-2025] | ||
gmt_git_ref: [master] | ||
timeout-minutes: 30 | ||
defaults: | ||
|
@@ -57,7 +57,7 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
|
@@ -69,7 +69,7 @@ jobs: | |
# environment cache is persistent for one week. | ||
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }} | ||
create-args: >- | ||
python=3.12 | ||
python=3.13 | ||
cmake | ||
make | ||
ninja | ||
|
@@ -187,7 +187,7 @@ jobs: | |
|
||
# Upload diff images on test failure | ||
- name: Upload diff images if any test fails | ||
uses: actions/upload-artifact@v4.4.3 | ||
uses: actions/upload-artifact@v4.5.0 | ||
if: ${{ failure() }} | ||
with: | ||
name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,15 +51,15 @@ jobs: | |
|
||
# Install Micromamba with conda-forge dependencies | ||
- name: Setup Micromamba | ||
uses: mamba-org/[email protected].2 | ||
uses: mamba-org/[email protected].3 | ||
with: | ||
environment-name: pygmt | ||
condarc: | | ||
channels: | ||
- conda-forge | ||
- nodefaults | ||
create-args: >- | ||
python=3.10 | ||
python=3.11 | ||
gmt=${{ matrix.gmt_version }} | ||
ghostscript<10 | ||
numpy<2 | ||
|
@@ -70,7 +70,7 @@ jobs: | |
contextily | ||
geopandas | ||
ipython | ||
pyarrow | ||
pyarrow-core | ||
rioxarray | ||
sphinx-gallery | ||
make | ||
|
Oops, something went wrong.