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

feat: start adding interface to override #834

Merged
merged 36 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
726c633
start adding interface to override
SobhanMP Aug 22, 2024
02d1fc8
complete the interface
SobhanMP Aug 22, 2024
84b362b
handle empty strings again
SobhanMP Aug 23, 2024
aa8e7e1
fix test
SobhanMP Aug 23, 2024
6732316
iter
SobhanMP Aug 27, 2024
16beb97
remove unused import
SobhanMP Aug 27, 2024
c32b28c
Merge branch 'main' into env
SobhanMP Aug 27, 2024
de3f331
use as_deref
SobhanMP Aug 27, 2024
2a9ffdd
add quad state overrides
SobhanMP Aug 28, 2024
8fad46f
fmt
SobhanMP Aug 28, 2024
8bbd546
remove useless methods
SobhanMP Aug 28, 2024
28e07ac
make python binding
SobhanMP Aug 28, 2024
1e030e9
add a few more tests, do not use default env var name, just in case
SobhanMP Aug 28, 2024
06dfb06
add a single python unit test
SobhanMP Aug 28, 2024
2dc4577
add a python test for good measure
SobhanMP Aug 28, 2024
3810861
add annotation
SobhanMP Aug 28, 2024
def7eb6
fix doc
SobhanMP Aug 28, 2024
f4a9803
annotate test
SobhanMP Aug 28, 2024
184f1a4
fmt
SobhanMP Aug 28, 2024
15a9b4b
Update crates/rattler_virtual_packages/src/lib.rs
SobhanMP Aug 29, 2024
237c669
Update py-rattler/rattler/virtual_package/virtual_package.py
SobhanMP Aug 29, 2024
a7cabed
rename some stuff
SobhanMP Aug 29, 2024
d83dfb7
Merge branch 'env' of github.com:SobhanMP/rattler into env
SobhanMP Aug 29, 2024
8f17402
fmt, stop using current
SobhanMP Aug 29, 2024
1618ae0
bump
SobhanMP Aug 29, 2024
a6a8403
mypy
SobhanMP Aug 29, 2024
752bdd2
ruf
SobhanMP Aug 29, 2024
976c30f
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
SobhanMP Aug 29, 2024
fb21bf4
Update crates/rattler_virtual_packages/src/lib.rs
SobhanMP Aug 29, 2024
b79dde0
apply @Baszalmastra's suggetions
SobhanMP Aug 29, 2024
d6c8d59
use `Default::default()`
SobhanMP Aug 29, 2024
157c813
fmt
SobhanMP Aug 29, 2024
1c03db5
fix test
SobhanMP Aug 29, 2024
9057932
change deprecation
SobhanMP Aug 29, 2024
5aa6af8
oops
SobhanMP Aug 29, 2024
24b24f8
Merge branch 'main' into env
SobhanMP Aug 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions crates/rattler-bin/src/commands/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,16 @@ pub async fn create(opt: Opt) -> anyhow::Result<()> {
})
.collect::<anyhow::Result<Vec<_>>>()?)
} else {
rattler_virtual_packages::VirtualPackage::current()
.map(|vpkgs| {
vpkgs
.iter()
.map(|vpkg| GenericVirtualPackage::from(vpkg.clone()))
.collect::<Vec<_>>()
})
.map_err(anyhow::Error::from)
rattler_virtual_packages::VirtualPackage::detect(
&rattler_virtual_packages::VirtualPackageOverrides::default(),
)
.map(|vpkgs| {
vpkgs
.iter()
.map(|vpkg| GenericVirtualPackage::from(vpkg.clone()))
.collect::<Vec<_>>()
})
.map_err(anyhow::Error::from)
}
})?;

Expand Down
2 changes: 1 addition & 1 deletion crates/rattler-bin/src/commands/virtual_packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use rattler_conda_types::GenericVirtualPackage;
pub struct Opt {}

pub fn virtual_packages(_opt: Opt) -> anyhow::Result<()> {
let virtual_packages = rattler_virtual_packages::VirtualPackage::current()?;
let virtual_packages = rattler_virtual_packages::VirtualPackage::detect(&Default::default())?;
for package in virtual_packages {
println!("{}", GenericVirtualPackage::from(package.clone()));
}
Expand Down
Loading