Skip to content
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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

24 changes: 12 additions & 12 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cairo:
- '1'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,13 +21,15 @@ curl:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
expat:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
freetype:
- '2'
gsl:
Expand All @@ -39,11 +41,11 @@ hdf5:
jasper:
- '4'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
libgdal:
- '3.9'
- '3.10'
libiconv:
- '1'
libjpeg_turbo:
Expand All @@ -55,14 +57,12 @@ libpng:
pixman:
- '0'
proj:
- '9.4'
- '9.5'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
9 changes: 0 additions & 9 deletions .ci_support/migrations/libgdal39.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/proj_loosen_pin.yaml

This file was deleted.

18 changes: 10 additions & 8 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '16'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -21,11 +21,13 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
expat:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
gsl:
- '2.7'
hdf4:
Expand All @@ -35,11 +37,11 @@ hdf5:
jasper:
- '4'
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9 *netlib
- 3.9.* *netlib
libgdal:
- '3.9'
- '3.10'
libiconv:
- '1'
libjpeg_turbo:
Expand All @@ -49,11 +51,11 @@ libnetcdf:
libpng:
- '1.6'
llvm_openmp:
- '16'
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
proj:
- '9.4'
- '9.5'
target_platform:
- osx-64
zip_keys:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore

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

24 changes: 18 additions & 6 deletions .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh

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

53 changes: 36 additions & 17 deletions .scripts/run_osx_build.sh

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

31 changes: 28 additions & 3 deletions azure-pipelines.yml

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

Loading