diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 1126186..d6390e3 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 74b8054 +_commit: f812aaa _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: rust diff --git a/Cargo.toml b/Cargo.toml index a3bc446..c42728a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,10 @@ crate-type = ["cdylib"] [dependencies] python_template_rust = { path = "./rust", version = "*" } pyo3 = { version = "0.26", features = ["abi3-py39", "extension-module", "multiple-pymethods"] } +<<<<<<< before updating strum = "0.27.2" +======= +>>>>>>> after updating [profile.release] panic = 'abort' diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ee8f650..d02cdb0 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1,5 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +<<<<<<< before updating version = 4 [[package]] @@ -87,3 +88,6 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +======= +version = 3 +>>>>>>> after updating diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 11c164d..780a7a8 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -14,8 +14,6 @@ path = "src/lib.rs" crate-type = ["rlib"] [dependencies] -serde = { version = "1.0", features = ["derive"] } -serde_json = "1" [profile.test.junit] path = "junit.xml"