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

feat: Bump dependencies to support new lockfile version #79

Merged
merged 2 commits into from
Dec 2, 2024
Merged

feat: Bump dependencies to support new lockfile version #79

merged 2 commits into from
Dec 2, 2024

Conversation

pavelzw
Copy link
Member

@pavelzw pavelzw commented Dec 2, 2024 •
edited
Loading

Motivation

pixi 0.39.0 has a new lockfile version that includes Conda Source packages
closes #78

Changes

Update rattler and adjust tests accordingly

@pavelzw pavelzw requested a review from delsner as a code owner December 2, 2024 14:59
@github-actions github-actions bot added the enhancement New feature or request label Dec 2, 2024
pavelzw
pavelzw commented Dec 2, 2024
View reviewed changes
src/pack.rs
tracing::debug!("Fetching package {}", package.location);
let url = match &package.location {
UrlOrPath::Url(url) => url,
UrlOrPath::Path(path) => anyhow::bail!("Path not supported: {}", path),
Copy link
Member Author

@pavelzw pavelzw Dec 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably related to #79 #71

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be addressed by #71?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, meant #71

src/pack.rs Outdated
Package::Conda(p) => conda_packages_from_lockfile.push(p),
Package::Pypi(_) => {
LockedPackageRef::Conda(CondaPackageData::Binary(binary_data)) => conda_packages_from_lockfile.push(binary_data.clone()),
LockedPackageRef::Conda(CondaPackageData::Source(_)) => anyhow::bail!("Conda source packages are not yet supported by pixi-pack"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xref #80

@pavelzw
Copy link
Member Author

pavelzw commented Dec 2, 2024 

    test_line_endings::case_1
    test_line_endings::case_2
    test_reproducible_shasum::case_1
    test_reproducible_shasum::case_2
    test_reproducible_shasum::case_4
    test_reproducible_shasum::case_5
    test_reproducible_shasum::case_6
    test_run_packed_executable

are failing because it tries to download pixi-pack 0.3.1 from github which hasn't released yet

delsner
delsner approved these changes Dec 2, 2024
View reviewed changes
Copy link
Member

@delsner delsner left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, modulo the CI failures. Thank you.

src/pack.rs
tracing::debug!("Fetching package {}", package.location);
let url = match &package.location {
UrlOrPath::Url(url) => url,
UrlOrPath::Path(path) => anyhow::bail!("Path not supported: {}", path),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be addressed by #71?

@pavelzw pavelzw merged commit aff2288 into main Dec 2, 2024
13 of 17 checks passed
@pavelzw pavelzw deleted the bump-dependencies branch December 2, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delsner delsner delsner approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pavelzw @delsner