From 830c644624c30063a334b3d0098e0b89ea401b01 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 May 2024 13:10:18 +0000 Subject: [PATCH 1/3] updated v1.12.5 --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9168e71..2107805 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyre" %} -{% set version = "1.12.4" %} +{% set version = "1.12.5" %} package: name: {{ name|lower }} @@ -7,10 +7,8 @@ package: source: - url: https://github.com/pyre/pyre/archive/v{{ version }}.tar.gz - sha256: b012445bcd085f9ed1a3ce51306e597ac4c575ea2f43c509ce4c9371da201571 - patches: - # missing ';' in a statement - process-timer.patch + sha256: e46ff416d0cc67169b08b075795e991092ba86670a3ae126f3f33be53e322ef2 + patches: process-timer.patch build: number: 0 @@ -22,6 +20,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - pybind11 # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - cmake - make # [unix] From ab0fd201df9af85caac3d66081caacf05c3c8c14 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 May 2024 13:11:35 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.21.12.55.42 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 3 ++- ....22python3.10.____cpythonpython_implcpython.yaml | 6 ++++++ ...1.22python3.8.____cpythonpython_implcpython.yaml | 6 ++++++ ...1.22python3.9.____cpythonpython_implcpython.yaml | 6 ++++++ ....23python3.11.____cpythonpython_implcpython.yaml | 6 ++++++ ....26python3.12.____cpythonpython_implcpython.yaml | 6 ++++++ ....22python3.10.____cpythonpython_implcpython.yaml | 6 ++++++ ...1.22python3.8.____cpythonpython_implcpython.yaml | 6 ++++++ ...1.22python3.9.____cpythonpython_implcpython.yaml | 6 ++++++ ....23python3.11.____cpythonpython_implcpython.yaml | 6 ++++++ ....26python3.12.____cpythonpython_implcpython.yaml | 6 ++++++ .ci_support/migrations/hdf51142.yaml | 7 ------- ....22python3.10.____cpythonpython_implcpython.yaml | 8 +++++++- ...1.22python3.8.____cpythonpython_implcpython.yaml | 8 +++++++- ...1.22python3.9.____cpythonpython_implcpython.yaml | 8 +++++++- ....23python3.11.____cpythonpython_implcpython.yaml | 8 +++++++- ....26python3.12.____cpythonpython_implcpython.yaml | 8 +++++++- .../osx_arm64_numpy1.22python3.10.____cpython.yaml | 6 ++++++ .../osx_arm64_numpy1.22python3.8.____cpython.yaml | 6 ++++++ .../osx_arm64_numpy1.22python3.9.____cpython.yaml | 6 ++++++ .../osx_arm64_numpy1.23python3.11.____cpython.yaml | 6 ++++++ .../osx_arm64_numpy1.26python3.12.____cpython.yaml | 6 ++++++ .gitattributes | 4 ++-- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 12 +++--------- .scripts/run_docker_build.sh | 6 ++++++ .scripts/run_osx_build.sh | 6 +++--- build-locally.py | 5 +++-- 29 files changed, 157 insertions(+), 30 deletions(-) delete mode 100644 .ci_support/migrations/hdf51142.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index af0f1e8..8f96d98 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..a37d70c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpythonpython_implcpython: @@ -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 43c8d9c..a439dbe 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: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_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 d07bb9b..14a46a4 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: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_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 ec43282..67af407 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: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_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 d2beef1..06853c0 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: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_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 7bd3dfd..db7dd59 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: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml index dcb0891..aab0772 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml index 7f4bae8..a944a97 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 7319088..99851a7 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml index 8347493..1905a8b 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml index 5906a60..e509815 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml deleted file mode 100644 index 1517ced..0000000 --- a/.ci_support/migrations/hdf51142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.2 -migrator_ts: 1692590899.44706 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 9a26d62..41c7065 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: 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 4cda91f..9f524fc 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: 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 8d3645a..bb10e64 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: 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 d940824..6ace6ab 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: 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 edf3506..d6a86ef 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 2239782..ecceb7b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 4d79288..366897b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index dcb133a..7e2f98e 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 5b87367..555d1ca 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 7e5f9f5..12d5788 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c002910..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..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}" @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -74,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_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted 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/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 7e68405025c5be2d3568f10b92b19cb06e7ddbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20A=C3=AFv=C3=A1zis?= Date: Tue, 21 May 2024 17:06:59 +0300 Subject: [PATCH 3/3] removed an obsolete patch --- recipe/meta.yaml | 1 - recipe/process-timer.patch | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 recipe/process-timer.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2107805..52e68da 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,6 @@ package: source: - url: https://github.com/pyre/pyre/archive/v{{ version }}.tar.gz sha256: e46ff416d0cc67169b08b075795e991092ba86670a3ae126f3f33be53e322ef2 - patches: process-timer.patch build: number: 0 diff --git a/recipe/process-timer.patch b/recipe/process-timer.patch deleted file mode 100644 index de2487b..0000000 --- a/recipe/process-timer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/pyre/timers/ProcessClock.icc b/lib/pyre/timers/ProcessClock.icc -index 1c80fcef8..b654c4dc2 100644 ---- a/lib/pyre/timers/ProcessClock.icc -+++ b/lib/pyre/timers/ProcessClock.icc -@@ -26,7 +26,7 @@ pyre::timers::ProcessClock::now() -> time_point_type - // otherwise - #else - // complain -- throw std::runtime_error("this platform doesn't have support for CLOCK_PROCESS_CPUTIME_ID") -+ throw std::runtime_error("this platform doesn't have support for CLOCK_PROCESS_CPUTIME_ID"); - #endif - } -