Allow builds of rc-tagged commits #280

danpetry · 2024-10-28T22:00:04Z

Checklist

Used a personal fork of the feedstock to propose changes
Bumped the build number (if the version is unchanged)
Reset the build number to 0 (if the version changed)
Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
Ensured the license file is being packaged.

Addresses "rc builds" point here
A step towards aligning Anaconda's and conda-forge's recipe
This has been used in the above recipe for a while; suggest disabling the CI, merging, and verifying next time it's needed to conserve resources, but I'm happy with a different approach if desired.

danpetry · 2024-10-28T22:00:27Z

@conda-forge-admin, please rerender

conda-forge-admin · 2024-10-28T22:04:24Z

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you, but it looks like there was nothing to do.

_{This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/11563334896.}

beckermr

Any rc builds need to go to non-main label.

hmaarrfk · 2024-10-28T23:07:52Z

Any rc builds need to go to non-main label.

can we do this with some kind of "jinja" syntax? i don't think so right?

beckermr · 2024-10-28T23:25:07Z

I think it might be able to zip in the channel config in the conda build config.

danpetry · 2024-10-29T20:56:50Z

Are you thinking something like this?

channel_targets:
  - conda-forge main
  - conda-forge rc
rc:
  - none
  - 5
zip_keys:
  -
    - channel_targets
    - rc

I don't think you'd want to build a release candidate and a normal release in parallel, though. I can't see a way to make channel_targets conditional, since it needs to be in the cbc.yaml.

What are your requirements around this in general? We use it to prepare for the main release and reduce latency between upstream and the conda package. We don't upload the rc packages.

Hi from oak park 👋

beckermr · 2024-10-29T21:28:52Z

Hi from oak park too!

Yeah I am ok building them in parallel.

You can also use a branch on the feedstock and only rebuild rcs periodically.

danpetry · 2024-10-29T22:43:26Z

Just to clarify, I don't need rc builds on conda-forge's channel, personally. What I'm trying to do here is to align Anaconda's recipe with your recipe to foster closer collaboration and pool resources. I spotted the point about rc builds in this issue and thought this feature would be a good place to start.

With that said, happy to contribute the previous code suggestion if it fits your needs.

danpetry · 2024-10-29T22:50:18Z

Are you thinking to make the rcs public? I think by the time we get an rc for a certain release building, the proper release will be pretty close if not already happened, so users will just want the proper release instead?

hmaarrfk · 2024-10-29T23:32:26Z

You can also use a branch on the feedstock and only rebuild rcs periodically.

Generally speaking this was my intention, somebody could keep a "1 commit PR" alive for referring to periodically.

trimmed down build matrix for reduced resource use and whatnot.

jakirkham · 2024-10-31T00:34:57Z

Matt is referring to CFEP 5, which spells out how we handle RCs

It could be useful to have RCs to test that upstream changes build ok here or perhaps test combinations of packages locally

Typically we do a branch for RCs, but that sounds like a lot of effort to maintain here

Perhaps we could do the matrix approach and just add a skip that ignores the stable or RC build depending on the version specified. That way there should be no additional builds and it would be pretty easy to flip on/off

conda-forge-admin · 2024-11-05T23:00:18Z

Hi! This is the friendly automated conda-forge-linting service.

I was trying to look for recipes to lint for you, but it appears we have a merge conflict. Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

conda-forge-admin · 2024-11-05T23:05:44Z

Hi! This is the friendly automated conda-forge-linting service.

I failed to even lint the recipe, probably because of a conda-smithy bug 😢. This likely indicates a problem in your meta.yaml, though. To get a traceback to help figure out what's going on, install conda-smithy and run conda smithy recipe-lint --conda-forge . from the recipe directory.

_{This message was generated by GitHub actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/11693957062.}

danpetry · 2024-11-05T23:07:37Z

Something like this?

conda-forge-admin · 2024-11-05T23:08:15Z

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

jakirkham · 2024-11-06T18:38:07Z

Seems like a good starting point. Let's try re-rendering

@conda-forge-admin , please re-render

…nda-forge-pinning 2024.11.06.14.03.29

conda-forge-admin · 2024-11-06T18:44:42Z

Hi! This is the friendly automated conda-forge-linting service.

I was trying to look for recipes to lint for you, but it appears we have a merge conflict. Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

jakirkham · 2024-12-19T19:25:58Z

Do we need to start a new cirun build here?

h-vetinari · 2024-12-19T22:49:07Z

Do we need to start a new cirun build here?

#298 is a big PR that's almost complete; I'm going to ask that we prioritize merging that one first.

jakirkham · 2024-12-20T07:32:37Z

This is a lightweight PR. Perhaps that makes easier to go in 😉

After all it seems like everyone is already on board here

h-vetinari · 2024-12-20T08:04:38Z

It doesn't make it easier, because that PR is a major reshuffle and we shouldn't also layer conflicts with unrelated changes on top (aside from the fact that the CI here is deep red). This PR is more focussed, and will be easier to adapt than vice versa. I can offer to do it even.

danpetry · 2024-12-22T23:47:04Z

I am fine to wait for that other PR. I am more or less on Christmas break now anyway. I can rebase once it's merged.

jakirkham · 2025-01-06T23:10:05Z

Given #298 is now in, can we wrap this one up and merge?

Note CI would pass if someone approved cirun on this PR. Idk that we need it though given the changes already passed on CPU only jobs and nothing here is GPU specific

danpetry · 2025-01-07T20:53:35Z

Has been re-rendered

h-vetinari

I don't think this is functional yet (see below).

As an aside, I think the variable/values are poorly named, if it causes us to write [rc == "rc"]. AFAICT we could just do

rc:
  - True
  - False

and then use # [not rc] and # [rc].

I'm not excited about the duplication of the variant configs, but if people thing this is a net benefit, then so be it.

recipe/meta.yaml

..._64_blas_implgenericchannel_targetsconda-forge_mainnumpy2.0python3.12.____cpythonrcNone.yaml

h-vetinari

OK, I understood the mechanics now, pretty clever. :)

I've played around with this on a branch and it works as expected. However, please follow the rename below (or simply pick h-vetinari@8f6694a)

recipe/conda_build_config.yaml

jakirkham · 2025-01-08T08:43:09Z

FWIW commit ( h-vetinari@8f6694a ) looks reasonable to me

Co-authored-by: h-vetinari <[email protected]>

danpetry · 2025-01-08T21:59:58Z

that's better, thanks

… comment to explain mechanism

…onda-forge-pinning 2025.01.08.14.39.32

danpetry · 2025-01-08T22:26:34Z

I've rendered locally but want to see how it goes in the CI, for rc and non-rc

jakirkham

Thanks Daniel! 🙏

The changes look good

Though let's make sure to go back to a stable version (and re-render) before merging

jakirkham · 2025-01-09T02:05:32Z

recipe/meta.yaml

@@ -1,4 +1,5 @@
-{% set version = "2.5.1" %}
+# if you wish to build release candidate number X, append the version string with ".rcX"
+{% set version = "2.5.1.rc1" %}


Suggested change

{% set version = "2.5.1.rc1" %}

{% set version = "2.5.1" %}

h-vetinari · 2025-01-09T12:04:06Z

I've picked the changes from this PR into 63779a3, given that 30 commits are a bit much for the core change of

 2 files changed, 26 insertions(+)

😉

Planning to merge this with #305 as soon as CI passes there.

danpetry · 2025-01-09T22:25:43Z

Cool sounds good. Closing this one, then.

jakirkham · 2025-01-09T23:13:24Z

Thanks you both and everyone who helped review! 🙏

danpetry · 2025-01-09T23:17:44Z

indeed thanks 🎉

danpetry added 2 commits October 28, 2024 16:30

Allow builds of rc-tagged commits

2d2f5c5

Bump build number [ci skip] ***NO_CI***

6349ad5

danpetry requested review from Tobias-Fischer, beckermr, benjaminrwilson, hmaarrfk and sodre as code owners October 28, 2024 22:00

beckermr previously requested changes Oct 28, 2024

View reviewed changes

Configure rcs to be labelled rc and non-rcs to be labelled main

6075c7a

Merge remote-tracking branch 'origin' into rc-builds

c89e60a

Error with sorting out merge conflicts

e694c18

Use jinja for jinja-defined variables

3f2eea7

danpetry requested a review from jeongseok-meta as a code owner November 6, 2024 18:23

MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.0, and co…

4823239

…nda-forge-pinning 2024.11.06.14.03.29

hmaarrfk mentioned this pull request Dec 24, 2024

Recipe overhaul: more tests & documentation, various clean-ups #298

Merged

5 tasks

Merge branch 'main' into rc-builds

3a84330

h-vetinari requested changes Jan 8, 2025

View reviewed changes

recipe/meta.yaml Outdated Show resolved Hide resolved

jakirkham reviewed Jan 8, 2025

View reviewed changes

..._64_blas_implgenericchannel_targetsconda-forge_mainnumpy2.0python3.12.____cpythonrcNone.yaml Outdated Show resolved Hide resolved

h-vetinari requested changes Jan 8, 2025

View reviewed changes

recipe/conda_build_config.yaml Outdated Show resolved Hide resolved

Don't use rc for a key and a value name [ci skip] ***NO_CI***

1ac8b5a

Co-authored-by: h-vetinari <[email protected]>

danpetry added 5 commits January 8, 2025 16:13

Adjust selectors for recent change; change jinja for consistency; add…

693a1b8

… comment to explain mechanism

MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…

74cedf4

…onda-forge-pinning 2025.01.08.14.39.32

MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…

b945746

…onda-forge-pinning 2025.01.08.14.39.32

Bugfix, change variant name in zip_keys too

208bae0

Set to an rc for testing

9bd8d66

danpetry added 2 commits January 8, 2025 16:37

Clarify comment some more [ci skip] ***NO_CI***

b210388

Comment tweak [ci skip] ***NO_CI***

12f5319

jakirkham requested changes Jan 9, 2025

View reviewed changes

danpetry closed this Jan 9, 2025

danpetry deleted the rc-builds branch January 9, 2025 22:25

Allow builds of rc-tagged commits #280

Allow builds of rc-tagged commits #280

Conversation

danpetry commented Oct 28, 2024 • edited Loading

danpetry commented Oct 28, 2024

conda-forge-admin commented Oct 28, 2024

beckermr left a comment

Choose a reason for hiding this comment

hmaarrfk commented Oct 28, 2024

beckermr commented Oct 28, 2024

danpetry commented Oct 29, 2024 • edited Loading

beckermr commented Oct 29, 2024

danpetry commented Oct 29, 2024

danpetry commented Oct 29, 2024 • edited Loading

hmaarrfk commented Oct 29, 2024

jakirkham commented Oct 31, 2024

conda-forge-admin commented Nov 5, 2024

conda-forge-admin commented Nov 5, 2024

danpetry commented Nov 5, 2024

conda-forge-admin commented Nov 5, 2024

jakirkham commented Nov 6, 2024

conda-forge-admin commented Nov 6, 2024

jakirkham commented Dec 19, 2024

h-vetinari commented Dec 19, 2024

jakirkham commented Dec 20, 2024

h-vetinari commented Dec 20, 2024

danpetry commented Dec 22, 2024 • edited Loading

jakirkham commented Jan 6, 2025

danpetry commented Jan 7, 2025

h-vetinari left a comment

Choose a reason for hiding this comment

h-vetinari left a comment

Choose a reason for hiding this comment

jakirkham commented Jan 8, 2025

danpetry commented Jan 8, 2025

danpetry commented Jan 8, 2025

jakirkham left a comment

Choose a reason for hiding this comment

jakirkham Jan 9, 2025

Choose a reason for hiding this comment

danpetry Jan 9, 2025

Choose a reason for hiding this comment

h-vetinari commented Jan 9, 2025

danpetry commented Jan 9, 2025

jakirkham commented Jan 9, 2025

danpetry commented Jan 9, 2025

danpetry commented Oct 28, 2024 •

edited

Loading

danpetry commented Oct 29, 2024 •

edited

Loading

danpetry commented Oct 29, 2024 •

edited

Loading

danpetry commented Dec 22, 2024 •

edited

Loading