Skip to content

Commit

Permalink
Merge pull request #16 from regro-cf-autotick-bot/rebuild-libboost186…
Browse files Browse the repository at this point in the history
…-0-1_h2a105a

Rebuild for libboost 1.86
  • Loading branch information
bgruening authored Aug 18, 2024
2 parents ed66c11 + aed74bc commit b5c36f5
Show file tree
Hide file tree
Showing 17 changed files with 74 additions and 51 deletions.
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.

8 changes: 4 additions & 4 deletions .ci_support/linux_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -34,4 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 4 additions & 4 deletions .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -34,4 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 4 additions & 4 deletions .ci_support/linux_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -34,4 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 4 additions & 4 deletions .ci_support/linux_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -34,4 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
8 changes: 4 additions & 4 deletions .ci_support/linux_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -34,4 +34,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
__migrator:
build_number: 1
kind: version
commit_message: "Rebuild for libboost 1.84"
commit_message: "Rebuild for libboost 1.86"
migration_number: 1
libboost_devel:
- "1.84"
- "1.86"
libboost_python_devel:
- "1.84"
migrator_ts: 1700834511.141209
- "1.86"
migrator_ts: 1723764795.6693385
10 changes: 6 additions & 4 deletions .ci_support/osx_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +15,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -31,4 +33,4 @@ python:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +15,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -31,4 +33,4 @@ python:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +15,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -31,4 +33,4 @@ python:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +15,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -31,4 +33,4 @@ python:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +15,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
liblapack:
- 3.9 *netlib
libnetcdf:
Expand All @@ -31,4 +33,4 @@ python:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .gitattributes

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

6 changes: 6 additions & 0 deletions .scripts/build_steps.sh

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

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

4 changes: 2 additions & 2 deletions build-locally.py

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 @@ -11,7 +11,7 @@ source:

build:
skip: true # [win]
number: 1
number: 2

requirements:
build:
Expand Down

0 comments on commit b5c36f5

Please sign in to comment.