Bump rattler for new lockfile support, fail on pypi packages #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
see #21 |
pavelzw
reviewed
Dec 3, 2024
pavelzw
reviewed
Dec 3, 2024
src/pixi_lock.rs
Outdated
| pypi_packages.dedup(); | ||
| if !pypi_packages.is_empty() { | ||
| warn!( | ||
| "The following packages are not conda packages and will be ignored: {:?}", |
There was a problem hiding this comment.
we shouldn't warn but error in this case. nobody reads warnings unless the program exits with code 1
pavelzw
reviewed
Dec 3, 2024
src/pixi_lock.rs
Outdated
Comment on lines
62
to
69
| match package { | ||
| LockedPackageRef::Conda(conda_package) => { | ||
| let package_record = conda_package.record(); | ||
| package_records.push(package_record.to_owned()); | ||
| } | ||
| LockedPackageRef::Pypi(_, _) => { | ||
| pypi_packages.push(package.name().to_string()); | ||
| } |
There was a problem hiding this comment.
we should deduplicate this code and put it into a separate function
pavelzw
reviewed
Dec 3, 2024
Comment on lines
1
to
38
| [project] | ||
| name = "conda-metadata-app" | ||
| version = "0.1.0" | ||
| description = "A streamlit app to query metadata from conda packages" | ||
| authors = ["jaimergp <jaimergp@users.noreply.github.com>"] | ||
| channels = ["conda-forge"] | ||
| platforms = ["linux-64", "win-64", "osx-arm64", "osx-64"] | ||
|
|
||
| [tasks] | ||
| dev = "streamlit run --server.runOnSave=true app.py" | ||
| deploy = "streamlit run --server.headless=true --global.developmentMode=false app.py" | ||
| schema = "python app_config.py" | ||
|
|
||
| [dependencies] | ||
| python = "3.12.*" | ||
| pip = "23.3.2.*" | ||
| pydantic-settings = ">=2.4.0,<3" | ||
| pydantic = ">=2.8.2,<3" | ||
| typing-extensions = ">=4.12.2,<5" | ||
| zstandard = ">=0.23.0,<0.24" | ||
| py-rattler = ">=0.7.0,<0.8" | ||
| setuptools = "*" | ||
|
|
||
| [feature.dev.dependencies] | ||
| pixi-pycharm = ">=0.0.6,<0.0.7" | ||
|
|
||
| [pypi-dependencies] | ||
| conda-forge-metadata = ">=0.11.0,<0.12" | ||
| conda-oci-mirror = { git = "https://github.com/channel-mirrors/conda-oci-mirror.git", rev = "25ea3e436f0b0bc5a9c646121efafc9c68e116cd" } # v0.1.0 | ||
| streamlit = ">=1.38.0,<2" | ||
| streamlit-searchbox = "==0.1.16" | ||
|
|
||
| [environments] | ||
| default = {} | ||
| dev = { features = ["dev"], no-default-feature = true } | ||
|
|
||
| [tool.conda-deny] | ||
| license-whitelist = "license_whitelist.toml" |
There was a problem hiding this comment.
let's make this example smaller
Suggested change
| [project] | |
| name = "conda-metadata-app" | |
| version = "0.1.0" | |
| description = "A streamlit app to query metadata from conda packages" | |
| authors = ["jaimergp <jaimergp@users.noreply.github.com>"] | |
| channels = ["conda-forge"] | |
| platforms = ["linux-64", "win-64", "osx-arm64", "osx-64"] | |
| [tasks] | |
| dev = "streamlit run --server.runOnSave=true app.py" | |
| deploy = "streamlit run --server.headless=true --global.developmentMode=false app.py" | |
| schema = "python app_config.py" | |
| [dependencies] | |
| python = "3.12.*" | |
| pip = "23.3.2.*" | |
| pydantic-settings = ">=2.4.0,<3" | |
| pydantic = ">=2.8.2,<3" | |
| typing-extensions = ">=4.12.2,<5" | |
| zstandard = ">=0.23.0,<0.24" | |
| py-rattler = ">=0.7.0,<0.8" | |
| setuptools = "*" | |
| [feature.dev.dependencies] | |
| pixi-pycharm = ">=0.0.6,<0.0.7" | |
| [pypi-dependencies] | |
| conda-forge-metadata = ">=0.11.0,<0.12" | |
| conda-oci-mirror = { git = "https://github.com/channel-mirrors/conda-oci-mirror.git", rev = "25ea3e436f0b0bc5a9c646121efafc9c68e116cd" } # v0.1.0 | |
| streamlit = ">=1.38.0,<2" | |
| streamlit-searchbox = "==0.1.16" | |
| [environments] | |
| default = {} | |
| dev = { features = ["dev"], no-default-feature = true } | |
| [tool.conda-deny] | |
| license-whitelist = "license_whitelist.toml" | |
| [project] | |
| name = "project-with-pypi" | |
| channels = ["conda-forge"] | |
| platforms = ["linux-64"] | |
| [dependencies] | |
| python = "3.12.*" | |
| [pypi-dependencies] | |
| conda-forge-metadata = ">=0.11.0,<0.12" | |
| [tool.conda-deny] | |
| license-whitelist = "license_whitelist.toml" |
pavelzw
approved these changes
Dec 4, 2024
pavelzw
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
pixihas introduced the version 6 forpixi.lockfiles.The APIs for this version are slightly different.
Changes
This PR updates both
rattler_conda_typesandrattler_lockto the newer version capable of handling version 6 lockfiles.