Skip to content

Commit 4af7c17

Browse files
authored
Merge branch 'main' into rajeeja/fix__xyz_to_lonlat_rad
2 parents 41114dd + 0fa0212 commit 4af7c17

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

ci/asv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- healpix
1414
- netcdf4
1515
- numba
16-
- numpy<2.3
16+
- numpy<2.4
1717
- pandas
1818
- pathlib
1919
- pre_commit

ci/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- cmocean
88
- netcdf4
99
- numba
10-
- numpy<2.3
10+
- numpy<2.4
1111
- pathlib
1212
- pre_commit
1313
- pytest

ci/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- matplotlib-inline
1919
- netcdf4
2020
- numba
21-
- numpy<2.3
21+
- numpy<2.4
2222
- pandas
2323
- pathlib
2424
- pre_commit

ci/install-upstream.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ pip uninstall -y \
2323
conda list
2424

2525
# if available install from scientific-python nightly wheels
26-
# constrain numpy to <=2.3 until numba supports newer versions
26+
# constrain numpy to <2.4 until numba supports newer versions
2727
# use stable pandas (not nightly) due to geopandas incompatibility with pandas nightly internals
2828
# (see: https://github.com/UXARRAY/uxarray/issues/1414)
2929
python -m pip install \
30-
'numpy<=2.3' \
30+
'numpy<2.4' \
3131
'pandas>=2.0.0'
3232

3333
python -m pip install \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies = [
3131
"matplotlib-inline",
3232
"netcdf4",
3333
"numba",
34-
"numpy<2.3",
34+
"numpy<2.4",
3535
"pandas",
3636
"pyarrow",
3737
"requests",

0 commit comments

Comments
 (0)