Skip to content

Commit

Permalink
Merge pull request #5 from jasoncolburne/integration
Browse files Browse the repository at this point in the history
integration
  • Loading branch information
m00sey authored May 1, 2023
2 parents 4106949 + 50078be commit 4a360ca
Show file tree
Hide file tree
Showing 29 changed files with 2,616 additions and 37 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
/cargo/*/Cargo.lock
/*.profraw
.idea
.vscode
lcov.info
16 changes: 11 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
[package]
name = "parside"
version = "0.1.3"
version = "0.2.0"
edition = "2021"
description = "Parser for Composable Event Streaming Representation (CESR)"
license = "Apache-2.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
# cesride = { version = "0.1.3", path = "../cesride" }
cesride = "0.1.3"
cesride = "0.6.0"
nom = "~7.1"
num-derive = "~0.3"
num-traits = "~0.2"
rmp-serde = "~1"
serde = { version = "~1", features = ["derive"] }
serde_json = { version = "~1", features = ["preserve_order"] }
serde_cbor = "~0.11"
thiserror = "~1"
anyhow = "~1"
18 changes: 1 addition & 17 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
python:
@cp Cargo.toml cargo/$@/
@echo "pyo3 = { version = \"0.18.0\", features = [\"abi3\", \"extension-module\"] }" >> cargo/$@/Cargo.toml
@echo >> cargo/$@/Cargo.toml
@cat cargo/$@/Cargo.toml.tail >> cargo/$@/Cargo.toml
@cd cargo/$@ && cargo build --release --target-dir ../../target/$@
@mv target/$@/release/libparside.dylib target/$@/release/parside.so

python-shell:
@cd target/python/release/ && python3

rust:
@cargo build --release

libs: rust python

clean:
cargo clean

Expand All @@ -22,9 +6,9 @@ fix:
cargo fmt

preflight:
cargo audit
cargo fmt --check
cargo clippy -- -D warnings
cargo build --release
cargo test --release
cargo audit
cargo tarpaulin
Loading

0 comments on commit 4a360ca

Please sign in to comment.