From e8cef2a0a71d8cf986d37a8b1face946e7f83fb8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:37:00 -0500 Subject: [PATCH] optree v0.9.2 (#18) Co-authored-by: Xuehai Pan --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- .azure-pipelines/azure-pipelines-win.yml | 5 ++++- .scripts/run_osx_build.sh | 10 +++++----- recipe/meta.yaml | 8 +++++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fd8f49f..7a254b6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -59,11 +59,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7e0cabc..e425a1d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -69,7 +69,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24d040f..ead2f8b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "optree" %} -{% set version = "0.9.1" %} -{% set sha256 = "d77262972b0a35ea0b5a91b80bfeeb1aae6abb796537d2ba79581a78247a09e7" %} +{% set version = "0.9.2" %} +{% set sha256 = "ed0e31f787c274da0cb354687030e0ebbe5a98d2a25876c7c114568fc9fc78d4" %} package: name: {{ name|lower }} @@ -12,7 +12,9 @@ source: build: skip: true # [python_impl == 'pypy'] - script: {{ PYTHON }} -m pip install . -vv + script: | + sed -i '' -E 's/20230802.0/20230125.3/' CMakeLists.txt # [osx and x86_64] + {{ PYTHON }} -m pip install . -vv number: 0 script_env: # [win] # Unset `CMAKE_GENERATOR` and let Visual Studio set to its default