Skip to content

Commit

Permalink
Merge pull request #48 from conda-forge-admin/conda_forge_admin_47
Browse files Browse the repository at this point in the history
Bump build number and re-render to compile with newer version of compilers
  • Loading branch information
traversaro authored Sep 8, 2024
2 parents 1ba5192 + de4ffbc commit 97ff27f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 24 deletions.
6 changes: 2 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -15,15 +15,14 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -34,7 +33,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- linux-64
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,15 +19,14 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -38,7 +37,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- linux-aarch64
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -15,15 +15,14 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -34,7 +33,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- linux-ppc64le
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,15 +17,14 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -36,7 +35,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- osx-64
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,15 +17,14 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -36,7 +35,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- osx-arm64
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ numpy:
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -24,7 +23,6 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- win-64
Expand Down
5 changes: 4 additions & 1 deletion build-locally.py

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

4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
- 305.patch

build:
number: 0
number: 1

outputs:
- name: manif
Expand Down Expand Up @@ -61,6 +61,8 @@ outputs:
- tl-optional
- python
- pip
- wheel
- setuptools
- cmake-build-extension
# Workaround for https://github.com/conda-forge/pybind11-feedstock/pull/94#issuecomment-2033804227
- pybind11 <2.12.0
Expand Down

0 comments on commit 97ff27f

Please sign in to comment.