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

Rebuild for gdal35 #31

Merged
Merged
Show file tree
Hide file tree
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
65 changes: 18 additions & 47 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
hdf5:
- 1.12.1
libgdal:
- '3.4'
- '3.5'
libnetcdf:
- 4.8.1
libxml2:
Expand Down
9 changes: 9 additions & 0 deletions .ci_support/migrations/gdal35.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
gdal:
- '3.5'
libgdal:
- '3.5'
migrator_ts: 1653326469.7301745
6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '12'
- '13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
- '13'
hdf5:
- 1.12.1
libgdal:
- '3.4'
- '3.5'
libnetcdf:
- 4.8.1
libxml2:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
hdf5:
- 1.12.1
libgdal:
- '3.4'
- '3.5'
libnetcdf:
- 4.8.1
libxml2:
Expand Down
3 changes: 2 additions & 1 deletion .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 42 additions & 15 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ctest --version

set GRIB_ADJUST_LONGITUDE_RANGE=NO

ctest -VV -C Release --exclude-regex "mdal_dynamic*|mdal_api*"
ctest -VV -C Release --exclude-regex "mdal_dynamic*|mdal_api*|mdal_gdal_netcdf*"
if errorlevel 1 exit /b 1

cd ..
Expand Down
3 changes: 1 addition & 2 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ make install
export PATH=$PATH:$PREFIX/lib

export GRIB_ADJUST_LONGITUDE_RANGE=NO
ctest -VV

ctest -VV --exclude-regex "mdal_gdal_netcdf*"
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:
sha256: a8a17c73a5868745fe7ce4ffe01b0ea20745e27438e0851eec68688d875e895c

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage('mdal', max_pin='x.x') }}

Expand Down