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

Correctly resolve requirement requested both as non-extra URL and non-URL with extras #9775

Merged
merged 4 commits into from
Apr 23, 2021

Commits on Apr 19, 2021

  1. Add failed test case

    uranusjr committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    a31f8fd View commit details
    Browse the repository at this point in the history
  2. Implement extra-ed requirement merging

    When a requirement is requested multiple times, some via a direct URL
    ("req @ URL") and some not but with extras ("req[extra] VERSION"), the
    resolver previous could not correctly find "req[extra]" if "req" is
    available in an index.
    
    This additional logic makes the resolver, when encountering a
    requirement with identifier "req[extra]", to also look for explicit
    candidates listed under "req", and add them as found matches for
    "req[extra]".
    uranusjr committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    0305e0d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9cab983 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Remove stray id(candidate) call

    Also moves the incompatibility candidate calculation to closer to their
    usages.
    uranusjr committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    cf4e3aa View commit details
    Browse the repository at this point in the history