Skip to content

Commit

Permalink
Merge pull request #1379 from tom--pollard/upload_packages_config
Browse files Browse the repository at this point in the history
configure_feedstock.py: Re-add per provider parsing of upload_packages
  • Loading branch information
isuruf authored Aug 11, 2020
2 parents 5b46fbe + 84ac79b commit ba281c2
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
8 changes: 5 additions & 3 deletions conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,11 @@ def _get_platforms_of_provider(provider, forge_config):
keep_noarchs.append(True)
else:
keep_noarchs.append(False)
upload_packages.append(True)
# Allow config to disable package uploads on a per provider basis,
# default to True if not set explicitly set to False by config entry.
upload_packages.append(
(forge_config.get(provider, {}).get("upload_packages", True))
)
elif (
provider == "azure"
and forge_config["azure"]["force"]
Expand Down Expand Up @@ -1466,8 +1470,6 @@ def _load_forge_config(forge_dir, exclusive_config_file):
"strategy": {"maxParallel": 4},
"variables": {"CONDA_BLD_PATH": r"D:\\bld\\"},
},
# disallow publication of azure artifacts for now.
"upload_packages": False,
# Force building all supported providers.
"force": False,
# name and id of azure project that the build pipeline is in
Expand Down
24 changes: 24 additions & 0 deletions news/upload_packages_config.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* Unparsed `"upload_packages": False` from default conda-forge.yml, as not parsed & no longer reflective of defaults

**Removed:**

* <news item>

**Fixed:**

* re-enabled `upload_packages` per provider to conda-forge.yml, which when set to False overrides default upload logic

**Security:**

* <news item>

0 comments on commit ba281c2

Please sign in to comment.