feat: add everything needed for activation to py-rattler

conda · Sep 6, 2023 · 0b258c0 · 0b258c0
1 parent 563fafb
commit 0b258c0
Show file tree

Hide file tree

Showing 13 changed files with 747 additions and 13 deletions.
diff --git a/crates/rattler_conda_types/src/lib.rs b/crates/rattler_conda_types/src/lib.rs
@@ -33,7 +33,7 @@ pub use match_spec::parse::ParseMatchSpecError;
 pub use match_spec::{MatchSpec, NamelessMatchSpec};
 pub use no_arch_type::{NoArchKind, NoArchType};
 pub use package_name::{InvalidPackageNameError, PackageName};
-pub use platform::{ParsePlatformError, Platform};
+pub use platform::{Arch, ParseArchError, ParsePlatformError, Platform};
 pub use prefix_record::PrefixRecord;
 pub use repo_data::patches::{PackageRecordPatch, PatchInstructions, RepoDataPatch};
 pub use repo_data::{ChannelInfo, ConvertSubdirError, PackageRecord, RepoData};

diff --git a/crates/rattler_conda_types/src/platform.rs b/crates/rattler_conda_types/src/platform.rs
@@ -47,6 +47,7 @@ impl Ord for Platform {
 }
 
 /// Known architectures supported by Conda.
+#[allow(missing_docs)]
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
 pub enum Arch {
     X86,
@@ -356,9 +357,11 @@ impl Arch {
     }
 }
 
+/// An error that can occur when parsing an arch from a string.
 #[derive(Debug, Error, Clone, Eq, PartialEq)]
 #[error("'{string}' is not a known arch")]
 pub struct ParseArchError {
+    /// The arch string that could not be parsed.
     pub string: String,
 }
 

diff --git a/py-rattler/Cargo.lock b/py-rattler/Cargo.lock
diff --git a/py-rattler/Cargo.toml b/py-rattler/Cargo.toml
@@ -10,6 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rattler_conda_types = { path = "../crates/rattler_conda_types", default-features = false }
+rattler_shell = { path = "../crates/rattler_shell", default-features = false }
 
 pyo3 = { version = "0.19", features = [
     "abi3-py38",

diff --git a/py-rattler/pyproject.toml b/py-rattler/pyproject.toml
@@ -21,3 +21,6 @@ license = "BSD-3-Clause"
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
+
+[tool.ruff]
+line-length = 120
diff --git a/py-rattler/rattler/platform/__init__.py b/py-rattler/rattler/platform/__init__.py
@@ -0,0 +1,3 @@
+from rattler.platform.platform import Platform
+
+__all__ = ["Platform"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from rattler.platform.platform import Platform

		__all__ = ["Platform"]