Commit 0e9989e

authored

Merge pull request clearloop#13 from hulufei/pyo-feature

Make programmable support to be an advanced feature

2 parents 2b54347 + f43e67d commit 0e9989eCopy full SHA for 0e9989e

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,9 @@ keyring = "0.8.0"`
`26`	`26`	`log = "0.4"`
`27`	`27`	`openssl = "0.10.26"`
`28`	`28`	`rand = "0.7.2"`
`29`		`-serde = "1.0.104"`
`30`		`-serde_derive = "1.0.104"`
	`29`	`+serde = { version = "1.0.104", features = ["derive"] }`
`31`	`30`	`serde_json = "1.0.44"`
`32`		`-pyo3 = "0.8.5"`
	`31`	`+pyo3 = { version = "0.8.5", optional = true }`
`33`	`32`	`toml = "0.5.5"`
`34`	`33`	`escaper = "0.1.0"`
`35`	`34`
`@@ -40,3 +39,6 @@ features = ["sqlite"]`
`40`	`39`	`[dependencies.reqwest]`
`41`	`40`	`version = "0.10.3"`
`42`	`41`	`features = ["blocking", "gzip", "json"]`
	`42`	`+`
	`43`	`+[features]`
	`44`	`+pym = ["pyo3"]`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,12 @@ impl Command for ListCommand {`
`132`	`132`
`133`	`133`	`// filtering...`
`134`	`134`	`// pym scripts`
`135`		`- if m.is_present("plan") {`
`136`		`- let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;`
`137`		`- crate::helper::squash(&mut ps, ids)?;`
	`135`	`+ #[cfg(feature = "pym")]`
	`136`	`+ {`
	`137`	`+ if m.is_present("plan") {`
	`138`	`+ let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;`
	`139`	`+ crate::helper::squash(&mut ps, ids)?;`
	`140`	`+ }`
`138`	`141`	`}`
`139`	`142`
`140`	`143`	`// filter tag`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,12 @@ impl Command for PickCommand {`
`78`	`78`
`79`	`79`	`// filtering...`
`80`	`80`	`// pym scripts`
`81`		`- if m.is_present("plan") {`
`82`		`- let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;`
`83`		`- crate::helper::squash(&mut problems, ids)?;`
	`81`	`+ #[cfg(feature = "pym")]`
	`82`	`+ {`
	`83`	`+ if m.is_present("plan") {`
	`84`	`+ let ids = crate::pym::exec(m.value_of("plan").unwrap_or(""))?;`
	`85`	`+ crate::helper::squash(&mut problems, ids)?;`
	`86`	`+ }`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`// tag filter`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ impl std::convert::From<openssl::error::ErrorStack> for Error {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// pyo3`
	`127`	`+#[cfg(feature = "pym")]`
`127`	`128`	`impl std::convert::From<pyo3::PyErr> for Error {`
`128`	`129`	`fn from(_: pyo3::PyErr) -> Self {`
`129`	`130`	`Error::ScriptError("Python script went Error".to_string())`

Lines changed: 1 addition & 0 deletions

Comments

(0)