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 proj931 #149

Closed
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
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

8 changes: 4 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ gsl:
hdf4:
- 4.2.15
hdf5:
- 1.14.2
- 1.14.3
jasper:
- '4'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
libgdal:
- '3.7'
- '3.8'
libiconv:
- '1'
libjpeg_turbo:
- 2.1.5
- '3'
libnetcdf:
- 4.9.2
libpng:
- '1.6'
pixman:
- '0'
proj:
- 9.3.0
- 9.3.1
target_platform:
- linux-64
zip_keys:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/hdf51141.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions .ci_support/migrations/jpeg_to_libjpeg_turbo.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ __migrator:
build_number: 1
kind: version
migration_number: 1
migrator_ts: 1693581350.7818532
migrator_ts: 1701494989.7141423
proj:
- 9.3.0
- 9.3.1
14 changes: 7 additions & 7 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -25,29 +25,29 @@ gsl:
hdf4:
- 4.2.15
hdf5:
- 1.14.2
- 1.14.3
jasper:
- '4'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
libgdal:
- '3.7'
- '3.8'
libiconv:
- '1'
libjpeg_turbo:
- 2.1.5
- '3'
libnetcdf:
- 4.9.2
libpng:
- '1.6'
llvm_openmp:
- '15'
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
proj:
- 9.3.0
- 9.3.1
target_platform:
- osx-64
zip_keys:
Expand Down
14 changes: 12 additions & 2 deletions .gitignore

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

15 changes: 12 additions & 3 deletions .scripts/build_steps.sh

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

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh

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

13 changes: 10 additions & 3 deletions .scripts/run_osx_build.sh

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

2 changes: 1 addition & 1 deletion 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/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source:
folder: triangle_tmp

build:
number: 50
number: 51
skip: True # [win]
features:
detect_binary_files_with_prefix: true
Expand Down
Loading