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.

Sign up for GitHub

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: Unpin NumPy in the GMT Dev Tests workflow and fix the dataarray_to_matrix doctest (#3208) #3226

Merged
merged 7 commits into from
Jun 18, 2024
Merged

CI: Unpin NumPy in the GMT Dev Tests workflow and fix the dataarray_to_matrix doctest (#3208) #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c826b6b
CI: Unpin NumPy in the "GMT Dev Tests" workflow (#3208)"
seisman May 6, 2024
a004d60
Merge branch 'main' into ci/unpin-numpy
seisman May 12, 2024
c37c800
Merge branch 'main' into ci/unpin-numpy
seisman Jun 16, 2024
3fc0156
Use NumPy 2.0
seisman Jun 16, 2024
4083600
Merge branch 'main' into ci/unpin-numpy
seisman Jun 17, 2024
92a69e0
Revert "Use NumPy 2.0"
seisman Jun 17, 2024
62194d9
dataarray_to_matrix: Make sure that the returned region/inc is a list…
seisman Jun 17, 2024
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/ci_tests_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
run: |
python -m pip install --pre --prefer-binary \
--extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
'numpy<2' pandas xarray netCDF4 packaging \
numpy pandas xarray netCDF4 packaging \
build contextily dvc geopandas ipython pyarrow rioxarray \
pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures pytest-xdist\
sphinx-gallery
Expand Down
2 changes: 2 additions & 0 deletions pygmt/clib/conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ def dataarray_to_matrix(grid):
grid = grid.sortby(variables=list(grid.dims), ascending=True)

matrix = as_c_contiguous(grid[::-1].to_numpy())
region = [float(i) for i in region]
inc = [float(i) for i in inc]
return matrix, region, inc


Expand Down
Loading