Skip to content

Commit

Permalink
Merge pull request #3 from aqora-io/replace-pip-with-uv
Browse files Browse the repository at this point in the history
replace pip with uv
  • Loading branch information
jpopesculian authored Feb 21, 2024
2 parents 5c4574e + 948be81 commit 559ccd0
Show file tree
Hide file tree
Showing 16 changed files with 299 additions and 254 deletions.
175 changes: 27 additions & 148 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ base32 = "0.4"
base64 = "0.21"
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4.4", features = ["derive", "cargo"] }
dialoguer = "0.11.0"
dirs = "5.0"
fs4 = { version = "0.7", features = ["tokio"] }
futures = "0.3"
Expand All @@ -35,7 +36,7 @@ open = "5.0"
pyo3 = { version = "0.20", features = ["auto-initialize", "serde"] }
pyo3-asyncio = { version = "0.20", features = ["attributes", "tokio-runtime"] }
rand = "0.8"
reqwest = { version = "0.11", features = ["stream"] }
reqwest = { version = "0.11", default-features = false, features = ["stream", "rustls-tls"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tempfile = "3.9"
Expand All @@ -46,3 +47,4 @@ tokio-tar = "0.3"
toml = "0.8"
url = { version = "2.5", features = ["serde"] }
uuid = "1.7"
which = "6.0"
8 changes: 6 additions & 2 deletions config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ pub struct PyProject {
}

impl PyProject {
pub fn name(&self) -> Option<&str> {
self.project.as_ref().map(|project| project.name.as_str())
}

pub fn set_name(&mut self, name: impl ToString) {
if let Some(project) = self.project.as_mut() {
project.name = name.to_string();
Expand Down Expand Up @@ -80,7 +84,7 @@ impl AqoraConfig {

#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct AqoraUseCaseConfig {
pub competition: String,
pub competition: Option<String>,
pub data: PathBuf,
pub template: Option<PathBuf>,
pub generator: PathStr<'static>,
Expand All @@ -99,7 +103,7 @@ pub struct LayerConfig {

#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct AqoraSubmissionConfig {
pub competition: String,
pub competition: Option<String>,
pub entity: Option<String>,
pub refs: HashMap<String, PathStr<'static>>,
}
Expand Down
1 change: 0 additions & 1 deletion runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ pyo3-asyncio = { version = "0.20", features = ["attributes", "tokio-runtime"] }
thiserror = "1.0"
tokio = { version = "1", features = ["sync", "signal", "process", "fs"] }
split-stream-by = "0.1"
which = "6.0"
Loading

0 comments on commit 559ccd0

Please sign in to comment.