From 6d20aa5fb6eec03feb6cda4e8b4a6ff8c9d29b01 Mon Sep 17 00:00:00 2001 From: Markus Fleischauer Date: Sat, 28 Sep 2024 19:25:05 +0200 Subject: [PATCH 1/2] bump to 6.0.6 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca6863c..165919e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ #{% set siriusVersion = "6.0.4" %} #{% set apiVersion = "2.1" %} -{% set version = "2.1+sirius6.0.5" %} +{% set version = "2.1+sirius6.0.6" %} {% set name = "r-sirius-ms" %} package: @@ -9,7 +9,7 @@ package: source: url: https://github.com/sirius-ms/sirius-client-openAPI/archive/refs/tags/{{ version }}.zip - sha256: f6498e115bfe620919565b3becd2d6d81592a61ce7bb7faf2d3628005a253914 + sha256: 8dc4aa7c08008cc14f229442ea3bcdca46f74cb0c5da7035de2b61fd08a0b366 build: noarch: generic @@ -39,7 +39,7 @@ requirements: - r-base64enc - r-stringr - r-processx - - sirius-ms >=6.0.5 + - sirius-ms >=6.0.6 test: files: From 9fcad7579879bda4e1a3c33a4a1d837858b9f77c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 18:50:04 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.28.06.15.53 --- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 4 ++-- build-locally.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6c805a9..af0b9ac 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 24ef201..33f3277 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 conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install 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 @@ -43,7 +43,7 @@ if EXIST LICENSE.txt ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally.