From 17b51b0c8ed31231572ac427bec6656b10ce6f79 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Wed, 5 Feb 2020 16:09:44 -0800 Subject: [PATCH] Update labels in CFEP 5 to align with survey results The original CFEP 5 had the labels as rc_package and dev_package. During the discussionof CFEP 5 (https://github.com/conda-forge/cfep/pull/3), a discussion and survey ensued about whether the prerelease indicators should be before the package name or after: https://github.com/conda-forge/cfep/pull/3#issuecomment-545011203 The results were that the prerelease indicators should be after, but the text of the CFEP was never updated. This commit updates the CFEP. --- cfep-05.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cfep-05.md b/cfep-05.md index 570a21c..a27ea1c 100644 --- a/cfep-05.md +++ b/cfep-05.md @@ -4,7 +4,7 @@ Status Accepted Author(s) Eric Dill <thedizzle@gmail.com> Created Sept 09, 2016 - Updated Oct 18, 2019 + Updated Feb 5, 2020 Discussion NA Implementation NA @@ -30,7 +30,7 @@ The same semantics are slightly more cumbersome within the Conda ecosystem but are still manageable. The analogous command with `conda` is (for example): ``` -conda install -c conda-forge/label/rc_matplotlib matplotlib +conda install -c conda-forge/label/matplotlib_rc matplotlib ``` We, as the conda-forge community need to arrive at a consensus for what labels @@ -63,28 +63,28 @@ See the Appendix for dev and rc version order specifics. To create a `dev` or `rc` package a PR can be issued into the `dev` or `rc` branch of the feedstock. -This branch must change the `recipe/conda_build_config.yaml` to point to the `dev_` or `rc_` label. +This branch must change the `recipe/conda_build_config.yaml` to point to the `_dev` or `_rc` label. For example, matplotlib rc releases would include: ```yaml ... channel_targets: - - conda-forge rc_matplotlib + - conda-forge matplotlib_rc ``` If a pre-release build of B depends on a pre-release build of A, then A should have, ```yaml ... channel_targets: - - conda-forge rc_A + - conda-forge A_rc ``` while B should have, ```yaml ... channel_sources: - - conda-forge/label/rc_A,conda-forge,defaults + - conda-forge/label/A_rc,conda-forge,defaults channel_targets: - - conda-forge rc_B + - conda-forge B_rc ``` in `recipe/conda_build_config.yaml` in their respective feedstocks. @@ -124,7 +124,7 @@ conda install -c conda-forge/label/LABEL_PACKAGE_NAME -c conda-forge PACKAGE_NAM For example, let's install matplotlib from the "rc" label: ``` -conda install -c conda-forge/label/rc_matplotlib -c conda-forge matplotlib +conda install -c conda-forge/label/matplotlib_rc -c conda-forge matplotlib ``` ## Work Items @@ -138,6 +138,14 @@ conda install -c conda-forge/label/rc_matplotlib -c conda-forge matplotlib This is tracked in https://github.com/conda-forge/conda-forge-ci-setup-feedstock/issues/66 +## Updates + +- Feb 5, 2020: The labels were changed to put the dev/rc indication after the + package name rather than before, i.e., `_dev` and + `_rc` instead of `dev_` and `rc_`, + respectively. This aligns with the conclusions of the survey and discussion + during the approval process for this CFEP. + ## Appendix If you wish to add numbers to your "dev" or "rc" you should follow the