Skip to content

Support Multiple Categories for Sub-Dependencies in Lockfile (Rebase #390) - #697

Merged
maresb merged 10 commits into
conda:mainfrom
maresb:multiple-categories
Sep 13, 2024
Merged

Support Multiple Categories for Sub-Dependencies in Lockfile (Rebase #390)#697
maresb merged 10 commits into
conda:mainfrom
maresb:multiple-categories

Conversation

@maresb

@maresb maresb commented Sep 13, 2024

Copy link
Copy Markdown
Contributor

Description

@srilman, 🤯 I can't believe that #390 rebased cleanly. I've been really careful what I've merged.

I'm going to make an attempt between this and #589...

🤞

@maresb
maresb requested a review from a team as a code owner September 13, 2024 16:45
@netlify

netlify Bot commented Sep 13, 2024

Copy link
Copy Markdown

Deploy Preview for conda-lock ready!

Name Link
🔨 Latest commit bd2043a
🔍 Latest deploy log https://app.netlify.com/sites/conda-lock/deploys/66e49fe5e4ecda0008ed00ed
😎 Deploy Preview https://deploy-preview-697--conda-lock.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

maresb and others added 4 commits September 13, 2024 19:53
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
@maresb
maresb force-pushed the multiple-categories branch from dd8e2a4 to c94113f Compare September 13, 2024 17:57
@maresb

maresb commented Sep 13, 2024

Copy link
Copy Markdown
Contributor Author

I was having trouble understanding the totality of your first commit, so I broke it up into 8 separate steps in #589. I just rebased that into this branch, setting you as coauthor on all the commits.

@maresb

maresb commented Sep 13, 2024

Copy link
Copy Markdown
Contributor Author

Something went wrong with the tests since my rebase. I have a suspicion...

@maresb

maresb commented Sep 13, 2024

Copy link
Copy Markdown
Contributor Author

That turned it green again! 🎉

Now I need to understand what's going on...

maresb and others added 6 commits September 13, 2024 21:44
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Co-authored-by: Srinivas Lade <srinulade1@gmail.com>
Also change default categories value from `{'main'}` to empty set
because we add instead of overwrite when we apply the categories.
@maresb

maresb commented Sep 13, 2024

Copy link
Copy Markdown
Contributor Author

LET'S DO THIS!!!!!

We should look at #300.

@maresb
maresb merged commit 41d3451 into conda:main Sep 13, 2024
@maresb
maresb deleted the multiple-categories branch September 13, 2024 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants