Merge pull request #339 from h-vetinari/no_defaults

remove defaults as an allowed channel_source
conda-forge · Oct 7, 2024 · 170fdf8 · 170fdf8
2 parents 0439210 + c48d823
commit 170fdf8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/recipe/conda_forge_ci_setup/build_utils.py b/recipe/conda_forge_ci_setup/build_utils.py
@@ -21,13 +21,17 @@
 
 _global_config = {
     "channels": {
-        "sources": ["conda-forge", "defaults"],
+        "sources": ["conda-forge"],
         "targets": [["conda-forge", "main"]],
     }
 }
 
 cf_conda_build_defaults = {"pkg_format": "2", "zstd_compression_level": 19}
 
+DEFAULTS_ALLOWED_FEEDSTOCKS = {
+    "caiman-feedstock",
+    "eis_toolkit-feedstock",
+}
 
 arg_feedstock_root = click.argument(
     "feedstock_root", type=click.Path(exists=True, file_okay=False, dir_okay=True)
@@ -213,9 +217,9 @@ def upload_package(feedstock_root, recipe_root, config_file, validate, private,
 
     upload_to_conda_forge = any(owner == "conda-forge" for owner, _ in channels)
     if upload_to_conda_forge and "channel_sources" in specific_config:
-        allowed_channels = [
-            "conda-forge", "conda-forge/label/\S+", "defaults", "c4aarch64",
-            "c4armv7l"]
+        allowed_channels = ["conda-forge", "conda-forge/label/\S+"]
+        if feedstock_name in DEFAULTS_ALLOWED_FEEDSTOCKS:
+            allowed_channels.append("defaults")
         for source_channel in source_channels.split(","):
             if source_channel.startswith('https://conda-web.anaconda.org/'):
                 source_channel = source_channel[len('https://conda-web.anaconda.org/'):]

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "conda-forge-ci-setup" %}
-{% set version = "4.11.2" %}
+{% set version = "4.12.0" %}
 {% set build = 0 %}
 
 {% set cuda_compiler_version = cuda_compiler_version or "None" %}

diff --git a/recipe/run_conda_forge_build_setup_linux b/recipe/run_conda_forge_build_setup_linux
@@ -27,10 +27,7 @@ else
     export CPU_COUNT="${CPU_COUNT:-2}"
 fi
 
-# Need strict priority for
-# - pypy as defaults is not fixed
-# - cos7 as defaults is not fixed
-# but ppl can turn this off
+# strict priority by default but ppl can turn this off
 conda config --env --set channel_priority $(cat ${FEEDSTOCK_ROOT}/conda-forge.yml | shyaml get-value channel_priority strict || echo strict)
 
 # the upstream image nvidia/cuda:9.2-devel-centos6 (on which linux-anvil-cuda:9.2 is based)

diff --git a/recipe/run_conda_forge_build_setup_osx b/recipe/run_conda_forge_build_setup_osx
@@ -17,8 +17,7 @@ conda config --env --remove-key aggressive_update_packages
 conda config --env --append aggressive_update_packages ca-certificates
 conda config --env --append aggressive_update_packages certifi
 
-# Need strict priority for pypy as defaults is not fixed
-# but ppl can turn this off
+# strict priority by default but ppl can turn this off
 conda config --env --set channel_priority $(cat ./conda-forge.yml | shyaml get-value channel_priority strict || echo strict)
 
 # CONDA_PREFIX might be unset