From 5c7c5ab0c940d29a3731d1fd90af71dd7424d94c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 12 Apr 2024 05:53:37 +0000 Subject: [PATCH 1/3] Rebuild for ipopt 3.14.15 --- .ci_support/migrations/ipopt31415.yaml | 8 ++++++++ recipe/meta.yaml | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/ipopt31415.yaml diff --git a/.ci_support/migrations/ipopt31415.yaml b/.ci_support/migrations/ipopt31415.yaml new file mode 100644 index 0000000..8fc68e4 --- /dev/null +++ b/.ci_support/migrations/ipopt31415.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ipopt 3.14.15 + kind: version + migration_number: 1 +ipopt: +- 3.14.15 +migrator_ts: 1712831185.5957112 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1362a64..d449069 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,13 +10,14 @@ source: sha256: a587834da36d98bec8784eab72a3acb975a220e19ad1b966ff4d3874d97fc2f3 build: - number: 2 + number: 3 skip: true # [python_impl == 'pypy'] skip: true # [win and vc<14] requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - {{ compiler('fortran') }} - cross-python_{{ target_platform }} # [build_platform != target_platform] From 817449d2bca3eec740942a5a6f702432d7a6d9ca Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 12 Apr 2024 05:54:07 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.11.22.26.35 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + ...numpy1.22python3.10.____cpythonpython_implcpython.yaml | 8 +++++++- ..._numpy1.22python3.8.____cpythonpython_implcpython.yaml | 8 +++++++- ..._numpy1.22python3.9.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.23python3.11.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.26python3.12.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.22python3.10.____cpythonpython_implcpython.yaml | 8 +++++++- ..._numpy1.22python3.8.____cpythonpython_implcpython.yaml | 8 +++++++- ..._numpy1.22python3.9.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.23python3.11.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.26python3.12.____cpythonpython_implcpython.yaml | 8 +++++++- ...numpy1.22python3.10.____cpythonpython_implcpython.yaml | 6 +++++- ..._numpy1.22python3.8.____cpythonpython_implcpython.yaml | 6 +++++- ..._numpy1.22python3.9.____cpythonpython_implcpython.yaml | 6 +++++- ...numpy1.23python3.11.____cpythonpython_implcpython.yaml | 6 +++++- ...numpy1.26python3.12.____cpythonpython_implcpython.yaml | 6 +++++- .../osx_arm64_numpy1.22python3.10.____cpython.yaml | 6 +++++- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 6 +++++- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 6 +++++- .../osx_arm64_numpy1.23python3.11.____cpython.yaml | 6 +++++- .../osx_arm64_numpy1.26python3.12.____cpython.yaml | 6 +++++- ...numpy1.22python3.10.____cpythonpython_implcpython.yaml | 6 +++++- ..._numpy1.22python3.8.____cpythonpython_implcpython.yaml | 6 +++++- ..._numpy1.22python3.9.____cpythonpython_implcpython.yaml | 6 +++++- ...numpy1.23python3.11.____cpythonpython_implcpython.yaml | 6 +++++- ...numpy1.26python3.12.____cpythonpython_implcpython.yaml | 6 +++++- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- azure-pipelines.yml | 4 ++-- build-locally.py | 5 +++-- 32 files changed, 160 insertions(+), 37 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c3dd163..8fd9365 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -49,6 +49,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 02e57a4..582b65f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -39,6 +39,7 @@ jobs: CONFIG: osx_arm64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index dd8a1c2..9c42fc2 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,7 +23,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -36,6 +40,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 427aa9b..af86724 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,7 +23,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -36,6 +40,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index cd78bd0..a4ff310 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,7 +23,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -36,6 +40,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 1c2b33f..ca78aa6 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,7 +23,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.23' pin_run_as_build: @@ -36,6 +40,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index ba90a3e..17a5486 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,7 +23,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.26' pin_run_as_build: @@ -36,6 +40,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 111cb0e..16a5228 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,7 +27,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -40,6 +44,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 177bc2e..d0c6b88 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,7 +27,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -40,6 +44,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index ea8208c..ad71e0f 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,7 +27,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: @@ -40,6 +44,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 818ea5d..9944449 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,7 +27,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.23' pin_run_as_build: @@ -40,6 +44,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 237f17b..789d8c3 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,7 +27,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.26' pin_run_as_build: @@ -40,6 +44,8 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index ab17432..95850d3 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 40580e5..db953a4 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index ad91730..dc792ee 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 9a0987c..8e428c4 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 4cef2cb..a0efb83 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 1cfd0eb..f0cd24d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 076d9c8..90c7935 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 9fe31f9..990af51 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index ae15055..209b424 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 13c06c4..590f317 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -17,7 +21,7 @@ fortran_compiler: fortran_compiler_version: - '12' ipopt: -- 3.14.14 +- 3.14.15 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 3ed83c9..ed68af0 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -1,5 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ fortran_compiler: fortran_compiler_version: - '5' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 20e03a6..4f0bf30 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -1,5 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ fortran_compiler: fortran_compiler_version: - '5' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 0f33446..a1fb08c 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -1,5 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ fortran_compiler: fortran_compiler_version: - '5' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml index e5624fb..69f1dbe 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -1,5 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ fortran_compiler: fortran_compiler_version: - '5' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 142ad94..fc103fc 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -1,5 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs +c_stdlib_version: +- '2019' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ fortran_compiler: fortran_compiler_version: - '5' ipopt: -- 3.14.14 +- 3.14.15 numpy: - '1.26' pin_run_as_build: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From c507cdcb30555e1cf601073c7d293db3fd58cf39 Mon Sep 17 00:00:00 2001 From: Marco Mangano <36549388+marcomangano@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:30:54 -0400 Subject: [PATCH 3/3] edit maintainers in recipe --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d449069..bd96b2b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,7 +79,7 @@ about: extra: recipe-maintainers: - - nwu63 + - ewu63 - marcomangano - eirikurj - whophil