From 36224ed52e312d34891a9bb25917bc0c7aa47f64 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:19:54 -0500 Subject: [PATCH] conda v23.5.2 (#212) * updated v23.5.2 * MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.13.11.37.28 --- .azure-pipelines/azure-pipelines-win.yml | 5 ++++- .scripts/run_osx_build.sh | 10 +++++----- recipe/meta.yaml | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f8b6d7c..7cd99fc 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -75,7 +75,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 025708f..8007569 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 317df21..306bc2f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set on_win = SUBDIR in ('win-64', 'win-32') %} {% set name = "conda" %} -{% set version = "23.5.0" %} -{% set sha256 = "57155b96dd94ba95e421b4c36695dbf6972bcfb9b5e41ee0674bb796b8386f58" %} +{% set version = "23.5.2" %} +{% set sha256 = "c82ab703f1784cd1ffa4cfad5fe80f1e994b9b7a612e9268ddd136c5ad19188e" %} # Running pytest requires the inclusion of test files which baloons # the size of the package; values can be "yes" or "no" {% set run_pytest = "no" %} @@ -16,7 +16,7 @@ source: sha256: {{ sha256 }} build: - number: 1 + number: 0 script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv && {{ PYTHON }} -m conda init --install # These are present when the new environment is created # so we have to exempt them from the list of initial files