Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow defaults::* spec #2927

Merged
merged 4 commits into from
Oct 23, 2023
Merged

Allow defaults::* spec #2927

merged 4 commits into from
Oct 23, 2023

Conversation

isuruf
Copy link
Contributor

@isuruf isuruf commented Oct 20, 2023

Fixes #2431

I'm not sure if this is the best way to fix this. Let me know what your thoughts are.

cc @jonashaag @AntoinePrv @jaimergp

@jonashaag
Copy link
Collaborator

Thanks!

Looks like it could be correct. We should know with a unit test :)

@isuruf
Copy link
Contributor Author

isuruf commented Oct 23, 2023

Added a test. Ready for review again.

Copy link
Collaborator

@jonashaag jonashaag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is the best way to do it but it is definitely an improvement over the current situation.

@jonashaag jonashaag merged commit 24f26a0 into mamba-org:main Oct 23, 2023
23 checks passed
@jaimergp
Copy link
Contributor

Is there any chance you folks would accept a backport for the 1.x branch so we can get this out relatively soon? It would be awesome to have this fix for conda-libmamba-solver!

@jonashaag
Copy link
Collaborator

IMO definitely yes!

@JohanMabille
Copy link
Member

@jaimergp yes, waiting for this one to get in too, and then we can start to backport and release.

isuruf added a commit to isuruf/mamba that referenced this pull request Oct 25, 2023
JohanMabille pushed a commit that referenced this pull request Oct 26, 2023
* Allow defaults::* spec (#2927)

* return architecture levels for micromamba (#2921)

* return architecture levels for micromamba

* fix formatting

* use function multiversioning only on x86

* fix formatting

* update test

* use __builtin_cpu_supports and check for more features

Co-authored-by: Marcel Bargull <mbargull@users.noreply.github.com>

---------

Co-authored-by: Marcel Bargull <mbargull@users.noreply.github.com>

* Fix channels with slashes regression (#2926)

* Fix channels with slashes regression

* fix formatting

* make the test isolated

Co-authored-by: Antoine Prouvost <AntoinePrv@users.noreply.github.com>

* Add more tests

* Use pytest utilities for negative testing

* Add extra test doc

---------

Co-authored-by: Antoine Prouvost <AntoinePrv@users.noreply.github.com>

* Fix for name change

---------

Co-authored-by: Marcel Bargull <mbargull@users.noreply.github.com>
Co-authored-by: Antoine Prouvost <AntoinePrv@users.noreply.github.com>
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.

Cannot use defaults::* match specs in the CLI
4 participants