Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Install pyarrow-core instead of pyarrow from conda-forge #3698

Merged
merged 4 commits into from
Dec 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ jobs:
netCDF4
packaging
geopandas
pyarrow
pyarrow-core
pytest
pytest-codspeed
pytest-mpl
2 changes: 1 addition & 1 deletion .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ jobs:
contextily
geopandas
ipython
pyarrow
pyarrow-core
rioxarray
make
pip
2 changes: 1 addition & 1 deletion .github/workflows/ci_doctests.yaml
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ jobs:
contextily
geopandas
ipython
pyarrow
pyarrow-core
rioxarray
make
pip
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
@@ -73,13 +73,13 @@ jobs:
numpy-version: '1.25'
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'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also need to update line 82.

Do we also want to update doc/install.md?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, done in commits 3e59046 and 0cef357

# 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'
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'
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests_legacy.yaml
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ jobs:
contextily
geopandas
ipython
pyarrow
pyarrow-core
rioxarray
sphinx-gallery
make
2 changes: 1 addition & 1 deletion ci/requirements/docs.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ dependencies:
- contextily
- geopandas
- ipython
- pyarrow
- pyarrow-core
- rioxarray
# Development dependencies (general)
- make
7 changes: 4 additions & 3 deletions doc/install.md
Original file line number Diff line number Diff line change
@@ -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
```
:::
::::
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ dependencies:
- contextily
- geopandas
- ipython
- pyarrow
- pyarrow-core
- rioxarray
# Development dependencies (general)
- dvc