Skip to content

Commit

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

Rebuild for libboost 1.82
  • Loading branch information
jochym authored Oct 5, 2023
2 parents fc2075d + cbc866b commit 5457527
Show file tree
Hide file tree
Showing 21 changed files with 113 additions and 240 deletions.
25 changes: 8 additions & 17 deletions .azure-pipelines/azure-pipelines-linux.yml

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

19 changes: 8 additions & 11 deletions .azure-pipelines/azure-pipelines-osx.yml

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

31 changes: 0 additions & 31 deletions .ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
Expand All @@ -9,16 +7,16 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
numpy:
- '1.21'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
Expand All @@ -9,16 +7,16 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
Expand All @@ -9,16 +7,16 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
Expand All @@ -9,16 +7,16 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
Expand All @@ -9,16 +7,16 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
numpy:
- '1.23'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
21 changes: 21 additions & 0 deletions .ci_support/migrations/boost_cpp_to_libboost.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
migrator_ts: 1695775149
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: "Rebuild for libboost 1.82"
# limit the number of prs for ramp-up
pr_limit: 20
max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 3 times
libboost_devel:
- 1.82
# This migration is matched with a piggy-back migrator
# (see https://github.com/regro/cf-scripts/pull/1668)
# that will replace boost-cpp with libboost-devel
boost_cpp:
- 1.82
# same for boost -> libboost-python-devel
libboost_python_devel:
- 1.82
boost:
- 1.82
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions .ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.78.0
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
llvm_openmp:
- '14'
- '15'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.21'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.78.0
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libboost_python_devel:
- '1.82'
liblapack:
- 3.9 *netlib
llvm_openmp:
- '14'
- '15'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
Loading

0 comments on commit 5457527

Please sign in to comment.