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

pkg: Use filtered_formula to represent dependencies #10918

Merged
merged 19 commits into from
Nov 3, 2024
Merged

pkg: Use filtered_formula to represent dependencies #10918

merged 19 commits into from
Nov 3, 2024

Commits on Nov 3, 2024

  1. pkg: Pass-through filtered_formula from opam files to solver 

    The `Dependency_set.t` representation can't deal with disjunctions but
in most cases that is not even necessary as the set gets turned into a
`filtered_formula` again. Thus it might be easier to keep the original
representation and implement the necessary dependency set functionality
on top of that.

Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    c2cd946 View commit details
    Browse the repository at this point in the history

  2. Remove unused Dependency_set 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    91e4293 View commit details
    Browse the repository at this point in the history

  3. Add a test showing that the disjunction in OPAM files is supported now 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    58b6ec5 View commit details
    Browse the repository at this point in the history

  4. Move filtered_formula into our own module 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    ad75b38 View commit details
    Browse the repository at this point in the history

  5. Determine the hash from the Sexp 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    c2e7c5d View commit details
    Browse the repository at this point in the history

  6. Move reachability into the formula 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    d207526 View commit details
    Browse the repository at this point in the history

  7. Add test for dependency formula changes 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0ffe7f8 View commit details
    Browse the repository at this point in the history

  8. Clean up the awkward API 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    35b285d View commit details
    Browse the repository at this point in the history

  9. Promote expected hash changes 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    1ec3f47 View commit details
    Browse the repository at this point in the history

  10. Update the test wording and show the difference 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0ce2372 View commit details
    Browse the repository at this point in the history

  11. test(pkg): demonstrate unreachable packages being included 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Marek Kubica <marek@tarides.com>
    @rgrinberg
    rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    df39a55 View commit details
    Browse the repository at this point in the history

  12. Do not include post dependencies in reachable packages 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    8e660c4 View commit details
    Browse the repository at this point in the history

  13. Replace sexp by dyn 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    8126edb View commit details
    Browse the repository at this point in the history

  14. Promote expected hash changes 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    6502ef4 View commit details
    Browse the repository at this point in the history

  15. post deps are excluded now 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    22b2e7c View commit details
    Browse the repository at this point in the history

  16. Simplify 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    222a27f View commit details
    Browse the repository at this point in the history

  17. Use Resolve_opam_formula to determine dependencies 

    Signed-off-by: Marek Kubica <marek@tarides.com>
    @Leonidas-from-XIV @rgrinberg
    Leonidas-from-XIV authored and rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    4c0018e View commit details
    Browse the repository at this point in the history

  18. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    35a71e5 View commit details
    Browse the repository at this point in the history

  19. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    ce95b47 View commit details
    Browse the repository at this point in the history