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

less aggressive overlapping markers #5887

Merged
merged 7 commits into from
Aug 13, 2024
Merged

less aggressive overlapping markers #5887

merged 7 commits into from
Aug 13, 2024

Commits on Aug 13, 2024

  1. uv-resolver: rewrite forking to be based on overlapping markers 

    Closes #4732
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ad18222 View commit details
    Browse the repository at this point in the history

  2. uv/tests: "mundane" updates to snapshots 

    I believe these are all changes that aren't necessarily
expected, but also seem harmless. Like the order in which
fork markers are written to the lock file. (Although one
wonders if we should fix that once and for all by defining
a complete sort function for forks.)
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8465a39 View commit details
    Browse the repository at this point in the history

  3. uv/tests: update test that expects to find a resolution 

    Fixes #4640
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    88ff427 View commit details
    Browse the repository at this point in the history

  4. uv/tests: only consider dependency specification for fork matching ma… 

    …rker

The test in this case has this comment:

```
/// If a dependency requests a prerelease version with an overlapping marker expression,
/// we should prefer the prerelease version in both forks.
```

With this setup:

```
    let pyproject_toml = context.temp_dir.child("pyproject.toml");
    pyproject_toml.write_str(indoc! {r#"
        [project]
        name = "example"
        version = "0.0.0"
        dependencies = [
            "cffi >= 1.17.0rc1 ; os_name == 'Linux'"
        ]
        requires-python = ">=3.11"
    "#})?;

    let requirements_in = context.temp_dir.child("requirements.in");
    requirements_in.write_str(indoc! {"
        cffi
        .
    "})?;
```

The change in this commit _seems_ more correct that what we had,
although it does seem to contradict the comment. Namely, in the `os_name
!= "Linux"` fork, we don't prefer the pre-release version since the
`cffi >= 1.17.0rc1` bound doesn't apply.

It's not quite clear what to do in this instance.
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    dd16235 View commit details
    Browse the repository at this point in the history

  5. uv/tests: update ecosystem snapshot for 'transformers'

    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9bffe19 View commit details
    Browse the repository at this point in the history

  6. ci: increase dev drive size 

    For working around linked errors:
https://github.com/astral-sh/uv/actions/runs/10371457087/job/28711821180?pr=5887
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a3b4d26 View commit details
    Browse the repository at this point in the history

  7. ecosystem: remove superfluous lock files 

    I didn't mean to commit these in #5970.
    @BurntSushi
    BurntSushi committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ca708f2 View commit details
    Browse the repository at this point in the history