Skip to content

Commit

Permalink
bump python 0.1.25 and oxen 0.8.4 and try to build for python 3.11 in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gschoeni committed Sep 19, 2023
1 parent 362c182 commit e6b1fee
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
name: "cp310-cp310",
version: "3.10"
},
{
name: "cp311-cp311",
version: "3.11"
},
]
rust: [stable]
platform: [
Expand Down
6 changes: 3 additions & 3 deletions oxen/Cargo.lock

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

4 changes: 2 additions & 2 deletions oxen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oxen"
version = "0.1.24"
version = "0.1.25"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -15,7 +15,7 @@ log = "0.4.17"
pyo3-log = "0.8.1"
tokio = { version = "1", features = ["full"] }
pyo3-polars = "0.6.0"
liboxen = "0.8.1"
liboxen = "0.8.4"

[build-dependencies]
cc = { version = "1.0", features = ["parallel"] }
Expand Down
6 changes: 4 additions & 2 deletions oxen/python/oxen/local_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def push(self, remote_name: str = "origin", branch: str = "main"):
"""
return self._repo.push(remote_name, branch)

def pull(self, remote_name: str = "origin", branch: str = "main"):
def pull(self, remote_name: str = "origin", branch: str = "main", all=False):
"""
Pull data from a remote repo to a local repo.
Expand All @@ -159,8 +159,10 @@ def pull(self, remote_name: str = "origin", branch: str = "main"):
The name of the remote to pull from.
branch: `str`
The name of the branch to pull from.
all: `bool`
Whether to pull all data from branch history or not. Default: False
"""
return self._repo.pull(remote_name, branch)
return self._repo.pull(remote_name, branch, all)

@property
def path(self):
Expand Down
5 changes: 5 additions & 0 deletions oxen/src/py_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ impl PyCommit {
self.commit.id.to_owned()
}

#[getter]
pub fn id(&self) -> String {
self.commit.id.to_string()
}

#[getter]
pub fn commit_id(&self) -> String {
self.commit.id.to_string()
Expand Down
4 changes: 2 additions & 2 deletions oxen/src/py_local_repo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ impl PyLocalRepo {
Ok(())
}

pub fn pull(&self, remote: &str, branch: &str) -> Result<(), PyOxenError> {
pub fn pull(&self, remote: &str, branch: &str, all: bool) -> Result<(), PyOxenError> {
pyo3_asyncio::tokio::get_runtime().block_on(async {
let repo = LocalRepository::from_dir(&self.path)?;
command::pull_remote_branch(&repo, remote, branch).await
command::pull_remote_branch(&repo, remote, branch, all).await
})?;
Ok(())
}
Expand Down

0 comments on commit e6b1fee

Please sign in to comment.