From 252329727dd6cc23116b23cb0f9560c4cf27f095 Mon Sep 17 00:00:00 2001 From: nichmor Date: Thu, 26 Sep 2024 00:24:52 +0200 Subject: [PATCH] feat: allow uploading on main channel for v1 recipes (#337) * feat: allow uploading on main channel * Update recipe/meta.yaml --------- Co-authored-by: Wolf Vollprecht Co-authored-by: Matthew R. Becker --- recipe/conda_forge_ci_setup/build_utils.py | 11 ----------- recipe/meta.yaml | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/recipe/conda_forge_ci_setup/build_utils.py b/recipe/conda_forge_ci_setup/build_utils.py index 742b0a4d..204c6d5e 100644 --- a/recipe/conda_forge_ci_setup/build_utils.py +++ b/recipe/conda_forge_ci_setup/build_utils.py @@ -228,17 +228,6 @@ def upload_package(feedstock_root, recipe_root, config_file, validate, private, "is not allowed" % ("conda-forge", source_channel)) return - build_tool = determine_build_tool(feedstock_root) - if build_tool != CONDA_BUILD and upload_to_conda_forge: - # make sure that we are not uploading to the main conda-forge channel - # when building packages with `rattler-build` - if ["conda-forge", "main"] in channels: - print( - "Uploading to conda-forge's main channel is not yet allowed when building with rattler-build.\n" - "You can set a label channel in the channel_targets section of the config file\n" - "to upload to a label channel." - ) - return # get the git sha of the current commit git_sha = subprocess.run( diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f916757..d555fcd4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,7 @@ {% set name = "conda-forge-ci-setup" %} -{% set version = "4.9.4" %} +{% set version = "4.10.0" %} {% set build = 0 %} + {% set cuda_compiler_version = cuda_compiler_version or "None" %} {% if cuda_compiler_version == "None" %} # prioritize non-CUDA variant via build number