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.

Sign up for GitHub

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

Jump to bottom

Alternative logic for solver creation tasks #270

Merged
merged 52 commits into from
Sep 15, 2023
Merged

Alternative logic for solver creation tasks #270

merged 52 commits into from
Sep 15, 2023

Commits on Aug 24, 2023

  1. start branch

    @jaimergp
    jaimergp committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    6235ec9 View commit details
    Browse the repository at this point in the history

  2. trigger ci

    @jaimergp
    jaimergp committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    5114824 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. port logic from conda/conda#9614

    @jaimergp
    jaimergp committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9fe2743 View commit details
    Browse the repository at this point in the history

  2. deselect a couple tests (accelerate and libmamba do not get along)

    @jaimergp
    jaimergp committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    19c24fe View commit details
    Browse the repository at this point in the history

  3. add news

    @jaimergp
    jaimergp committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    cb3dc80 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Apply suggestions from code review

    @jaimergp
    jaimergp authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    1c385eb View commit details
    Browse the repository at this point in the history

  2. Alternative logic for solver creation tasks

    @jaimergp
    jaimergp committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    14061ed View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch 'main' into investigate-test-prune-errors

    @jezdez
    jezdez authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    5bb867e View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    ea64379 View commit details
    Browse the repository at this point in the history

  3. fix tests/core/test_solve.py::test_auto_update_conda

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    fc1530c View commit details
    Browse the repository at this point in the history

  4. some progress with pins (but not quite there yet)

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    15486b0 View commit details
    Browse the repository at this point in the history

  5. Increase timeouts in CI env setup

    @jaimergp
    jaimergp authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    889fe15 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of github.com:conda/conda-libmamba-solver into re… 

    …vamp-task-creation
    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e3e0b9a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'investigate-test-prune-errors' of github.com:conda/cond… 

    …a-libmamba-solver into revamp-task-creation
    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    74ff234 View commit details
    Browse the repository at this point in the history

  8. allow uninstall by default only on removals

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e40f0da View commit details
    Browse the repository at this point in the history

  9. handle prune

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    3073a78 View commit details
    Browse the repository at this point in the history

  10. avoid crash

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    49f201a View commit details
    Browse the repository at this point in the history

  11. cleanup

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    c5cdb04 View commit details
    Browse the repository at this point in the history

  12. only lock the installed spec

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e5b3e75 View commit details
    Browse the repository at this point in the history

  13. pre-commit

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    2395860 View commit details
    Browse the repository at this point in the history

  14. add SolverInputState.always_update helper mapping

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    ebc2885 View commit details
    Browse the repository at this point in the history

  15. allow uninstall of conflicts

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    ba202e1 View commit details
    Browse the repository at this point in the history

  16. use always_update list for simplicity

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    10a67f8 View commit details
    Browse the repository at this point in the history

  17. not update-all if pinned

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    122f835 View commit details
    Browse the repository at this point in the history

  18. explain pins if involved in errors

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    92f3314 View commit details
    Browse the repository at this point in the history

  19. re-enable original test_neutering_of_historic_specs

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    81d350d View commit details
    Browse the repository at this point in the history

  20. bump minimum required conda and libmamba versions

    @jaimergp
    jaimergp committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    629f381 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. fix tests/core/test_solve.py::test_force_remove_1 and tests/core/test… 

    …_solve.py::test_pinned_1
    @jaimergp
    jaimergp committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    c41a930 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Re-enable tests that are failing

    @costrouc
    costrouc committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    07dc6d1 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Require libmambapy >= 1.5.1

    @jaimergp
    jaimergp authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    a39d1d1 View commit details
    Browse the repository at this point in the history

  2. pre-commit

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    2c7fa21 View commit details
    Browse the repository at this point in the history

  3. amend news

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    03d0e56 View commit details
    Browse the repository at this point in the history

  4. Update __init__.py

    @jaimergp
    jaimergp authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    32c4435 View commit details
    Browse the repository at this point in the history

  5. fix test_neutering_of_historic_specs

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    4c2bdc3 View commit details
    Browse the repository at this point in the history

  6. consider 1.5.1 in warnings too

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    307c0a0 View commit details
    Browse the repository at this point in the history

  7. pre-commit

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    466182d View commit details
    Browse the repository at this point in the history

  8. adjust test

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    5af3deb View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/feat-reenable-tests' into revamp… 

    …-task-creation
    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    0f49202 View commit details
    Browse the repository at this point in the history

  10. remove comment

    @jaimergp
    jaimergp committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7ee5f9f View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. fix json serialization

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    86375e2 View commit details
    Browse the repository at this point in the history

  2. xfail in 1.5.1 too

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2fab449 View commit details
    Browse the repository at this point in the history

  3. catch RuntimeError for the whole 1.5.x series

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2cccbc6 View commit details
    Browse the repository at this point in the history

  4. xfail test_explicit

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    24edbaf View commit details
    Browse the repository at this point in the history

  5. fix test_pinned_1

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    225f5c0 View commit details
    Browse the repository at this point in the history

  6. lock installed name-only pinned packages

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    40d5917 View commit details
    Browse the repository at this point in the history

  7. do not add installed channels to list if --override-channels in use

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2533748 View commit details
    Browse the repository at this point in the history

  8. add adjusted variant for test_priority

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    efffa95 View commit details
    Browse the repository at this point in the history

  9. always define lock

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    67417ce View commit details
    Browse the repository at this point in the history

  10. explain some deselected tests

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    47843a1 View commit details
    Browse the repository at this point in the history

  11. adjust test_install_features

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    9e17e10 View commit details
    Browse the repository at this point in the history

  12. xfail test_export

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    8e300d8 View commit details
    Browse the repository at this point in the history

  13. pre-commit

    @jaimergp
    jaimergp committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    1aeaf0a View commit details
    Browse the repository at this point in the history