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

Environment pinning #985

Merged
merged 66 commits into from
Dec 13, 2023
Merged

Environment pinning #985

merged 66 commits into from
Dec 13, 2023

Commits on Dec 9, 2023

  1. Add conda environment definitions 

    They can be used together, e.g.,
```shell
conda env create --name <MYENV> --file environments/environment.yml --file environments/petsc-environment.yml
```
although the more you combine, the less likely that conda will
find a "solution".
    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    2cd8233 View commit details
    Browse the repository at this point in the history

  2. Add multi-platform lockfiles produced by conda-lock lock

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    509fb9b View commit details
    Browse the repository at this point in the history

  3. Add single-platform explicit lockfiles from conda-lock render

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    84e40b2 View commit details
    Browse the repository at this point in the history

  4. Convert azure pipeline to use conda-lock lockfiles

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    0eb2507 View commit details
    Browse the repository at this point in the history

  5. Fix comparison syntax

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    2f5b5f8 View commit details
    Browse the repository at this point in the history

  6. Close bash if clause

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    0001a0b View commit details
    Browse the repository at this point in the history

  7. Disable libmamba solve

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    5c0b6fb View commit details
    Browse the repository at this point in the history

  8. Actually disable libmamba

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    f261dc5 View commit details
    Browse the repository at this point in the history

  9. Try really really hard to turn off libmamba

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    37990e6 View commit details
    Browse the repository at this point in the history

  10. Install pip to make wheels

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    98c660c View commit details
    Browse the repository at this point in the history

  11. Move lockfiles into subdirectory

    @guyer
    guyer committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    33a9a2c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. Pin PETSc on macOS 

    Linkage between petsc 3.20.2_*_102 and scotch 7.0 is broken.
petsc 3.20.2_*_101 and scotch 6.x is OK.
    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    eb4216f View commit details
    Browse the repository at this point in the history

  2. Change constraint to actual problematical package

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    33f7ffb View commit details
    Browse the repository at this point in the history

  3. Restore libmamba and explain why classic solver is needed

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    8de8dd1 View commit details
    Browse the repository at this point in the history

  4. Update locks for midnight build

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    94568f5 View commit details
    Browse the repository at this point in the history

  5. Fix name

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    616f437 View commit details
    Browse the repository at this point in the history

  6. Document different triggers

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    30e986d View commit details
    Browse the repository at this point in the history

  7. Pass locks to downstream stages

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    2d6e823 View commit details
    Browse the repository at this point in the history

  8. Fix indentation

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    ce59438 View commit details
    Browse the repository at this point in the history

  9. Copy locks into place

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    95fc95a View commit details
    Browse the repository at this point in the history

  10. Fix indentation and hope downloading artifacts works "right"

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    514a040 View commit details
    Browse the repository at this point in the history

  11. Rename lock artifact and explicitly move lockfiles

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    9a0c97d View commit details
    Browse the repository at this point in the history

  12. Skip slow step

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    b85e81b View commit details
    Browse the repository at this point in the history

  13. Move from and to explicit directories

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7a88272 View commit details
    Browse the repository at this point in the history

  14. Test midnight build

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    a73b1fe View commit details
    Browse the repository at this point in the history

  15. Fix bash syntax

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    5f9f3a4 View commit details
    Browse the repository at this point in the history

  16. Don't create locks over existing locks

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    5ff422f View commit details
    Browse the repository at this point in the history

  17. Add environment for scipy for symmetry

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    435cc87 View commit details
    Browse the repository at this point in the history

  18. Install from environment.yml when not using lockfiles 

    Don't regenerate lockfiles every time. Slow and clunky.
    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7b11a91 View commit details
    Browse the repository at this point in the history

  19. Fix variable syntax

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    6cea356 View commit details
    Browse the repository at this point in the history

  20. Debug which "not"

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    2493087 View commit details
    Browse the repository at this point in the history

  21. By all means, lets have >= 3 incompatible variable syntaxen

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    292b2b7 View commit details
    Browse the repository at this point in the history

  22. Microsoft should by their coders higher quality crack

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7e20829 View commit details
    Browse the repository at this point in the history

  23. I hate these people

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    d060fe0 View commit details
    Browse the repository at this point in the history

  24. If at first you don't succeeed...

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7295350 View commit details
    Browse the repository at this point in the history

  25. Pass use_lockfile as template parameter

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    e9dde88 View commit details
    Browse the repository at this point in the history

  26. Pass runtime value? 

    https://stackoverflow.com/questions/54246102/azure-pipelines-passing-a-variable-as-a-parameter-to-a-template
    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    861cf55 View commit details
    Browse the repository at this point in the history

  27. Stop trying to use a runtime variable as a condition 

    Microsoft is stupid
    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    6ea5e12 View commit details
    Browse the repository at this point in the history

  28. Pass solver as template variable

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    334459d View commit details
    Browse the repository at this point in the history

  29. Toggle conda environment mode

    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    79d387b View commit details
    Browse the repository at this point in the history

  30. Revert "Toggle conda environment mode" 

    This reverts commit 79d387b.
    @guyer
    guyer committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    77c359c View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Revert "Revert "Toggle conda environment mode"" 

    This reverts commit 77c359c.
    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0dc6f52 View commit details
    Browse the repository at this point in the history

  2. Clarify purpose of environment file

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    fdb1a15 View commit details
    Browse the repository at this point in the history

  3. Fix conda env create syntax 

    Merge environment files, as `conda env create` doesn't accept
multiples (it ignores all but last).
See conda/conda#9294.
    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0dd1306 View commit details
    Browse the repository at this point in the history

  4. Document use of lockfiles 

    Bring rest of conda documentation up to date.
    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    3bcfe1c View commit details
    Browse the repository at this point in the history

  5. Fix references

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    03596fe View commit details
    Browse the repository at this point in the history

  6. Revert "Revert "Revert "Toggle conda environment mode""" 

    This reverts commit 0dc6f52.
    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    39bd76f View commit details
    Browse the repository at this point in the history

  7. Pass solver to non-lockfile installations

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5e07621 View commit details
    Browse the repository at this point in the history

  8. Pass only solvers to install

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    6eebefa View commit details
    Browse the repository at this point in the history

  9. Revert "Revert "Revert "Revert "Toggle conda environment mode"""" 

    This reverts commit 39bd76f.
    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4095a61 View commit details
    Browse the repository at this point in the history

  10. Incorporate pip in install.yml template

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    edf8826 View commit details
    Browse the repository at this point in the history

  11. Document different modes of creating conda environment

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    26a712d View commit details
    Browse the repository at this point in the history

  12. Remove gratuitous conda packages

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    099eb9b View commit details
    Browse the repository at this point in the history

  13. Fix phrasing

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    b4c0229 View commit details
    Browse the repository at this point in the history

  14. Fix reference and tweaks

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    969c0a4 View commit details
    Browse the repository at this point in the history

  15. Fix references

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8476631 View commit details
    Browse the repository at this point in the history

  16. Fix pip

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    a905eea View commit details
    Browse the repository at this point in the history

  17. Install pip without libmamba

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    048f33c View commit details
    Browse the repository at this point in the history

  18. Ensure CI environment has pip

    @guyer
    guyer committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4f75df0 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Document that installing more than one solver isn't necessary

    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    35a1746 View commit details
    Browse the repository at this point in the history

  2. Update locks to get new petsc 

    Skip over broken petsc on macOS
conda-forge/petsc-feedstock#180
    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a480a84 View commit details
    Browse the repository at this point in the history

  3. Downgrade petsc 

    Build with scotch 7.0.4 freezes in parallel.
Sort it out in usnistgov/fipy@harmonize_solvers.
    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    4c201df View commit details
    Browse the repository at this point in the history

  4. Merge base-environment.yml into solver environments 

    Easier to explain and less fragile, at the expense of redundancy
in individual environment.yml files. It's a shame they don't have
an include mechanism.

Refactored environment documentation into environments/README.rst.
    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1c1afa5 View commit details
    Browse the repository at this point in the history

  5. Bump the locks

    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a22d494 View commit details
    Browse the repository at this point in the history

  6. Fix reST and spelling

    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    49cf812 View commit details
    Browse the repository at this point in the history

  7. Point to blog posting about conda-lock

    @guyer
    guyer committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    277e713 View commit details
    Browse the repository at this point in the history