From 2e998c73bf0dd8ba4d39fd5564c11a513c7c39cd Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:02:01 +1300 Subject: [PATCH 1/3] CI: Install pyarrow-core instead of pyarrow from conda-forge Reduce unnecessary optional dependencies when installing `pyarrow` from conda-forge. Xref https://github.com/conda-forge/pyarrow-feedstock/pull/111 --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/ci_docs.yml | 2 +- .github/workflows/ci_doctests.yaml | 2 +- .github/workflows/ci_tests.yaml | 2 +- .github/workflows/ci_tests_legacy.yaml | 2 +- ci/requirements/docs.yml | 2 +- environment.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 7d643ed1429..2fcc724ddae 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -65,7 +65,7 @@ jobs: netCDF4 packaging geopandas - pyarrow + pyarrow-core pytest pytest-codspeed pytest-mpl diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index eb5497143bc..749d5b42b00 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -103,7 +103,7 @@ jobs: contextily geopandas ipython - pyarrow + pyarrow-core rioxarray make pip diff --git a/.github/workflows/ci_doctests.yaml b/.github/workflows/ci_doctests.yaml index e3a9f2e6d98..1d0cdac4f98 100644 --- a/.github/workflows/ci_doctests.yaml +++ b/.github/workflows/ci_doctests.yaml @@ -60,7 +60,7 @@ jobs: contextily geopandas ipython - pyarrow + pyarrow-core rioxarray make pip diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 0c874fdac77..005eb99e133 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -73,7 +73,7 @@ jobs: numpy-version: '1.24' pandas-version: '=2.0' xarray-version: '=2023.04' - optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery' + 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' diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index d8195e8fe17..1af5e00cd38 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -70,7 +70,7 @@ jobs: contextily geopandas ipython - pyarrow + pyarrow-core rioxarray sphinx-gallery make diff --git a/ci/requirements/docs.yml b/ci/requirements/docs.yml index 29109bd9309..84be526f47f 100644 --- a/ci/requirements/docs.yml +++ b/ci/requirements/docs.yml @@ -16,7 +16,7 @@ dependencies: - contextily - geopandas - ipython - - pyarrow + - pyarrow-core - rioxarray # Development dependencies (general) - make diff --git a/environment.yml b/environment.yml index c9a9932f596..2097c902660 100644 --- a/environment.yml +++ b/environment.yml @@ -16,7 +16,7 @@ dependencies: - contextily - geopandas - ipython - - pyarrow + - pyarrow-core - rioxarray # Development dependencies (general) - dvc From 3e59046581ba796912b0a475391d17bdce6d9d82 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:40:46 +1300 Subject: [PATCH 2/3] Missing line --- .github/workflows/ci_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 35a20d5c38a..8ed7e728c02 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -79,7 +79,7 @@ jobs: numpy-version: '2.2' pandas-version: '' xarray-version: '' - optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery' + 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.12' From 0cef357ae4a76e95456c7166d442d59ec5c48e3b Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:42:03 +1300 Subject: [PATCH 3/3] doc: Suggest installing pyarrow-core in installation instructions --- doc/install.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/install.md b/doc/install.md index 0323d4c021b..55d2290295f 100644 --- a/doc/install.md +++ b/doc/install.md @@ -162,19 +162,20 @@ From now on, all commands will take place inside the virtual environment called and won't affect your default `base` installation. ::::: {tip} -You can also enable more PyGMT functionality by installing PyGMT's optional dependencies in the environment. +You can also enable more PyGMT functionalities by installing PyGMT's optional +dependencies in the environment. :::: {tab-set} ::: {tab-item} mamba :sync: mamba ``` -mamba install contextily geopandas ipython pyarrow rioxarray +mamba install contextily geopandas ipython pyarrow-core rioxarray ``` ::: ::: {tab-item} conda :sync: conda ``` -conda install contextily geopandas ipython pyarrow rioxarray +conda install contextily geopandas ipython pyarrow-core rioxarray ``` ::: ::::