[transaction builder generator] update serde-generate + fix (ignored)…

… python test Closes: #6111
diem · Sep 19, 2020 · 6cb6df8 · 6cb6df8
1 parent 28ddabf
commit 6cb6df8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/libradoc/Cargo.toml b/common/libradoc/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 serde_yaml = "0.8.13"
 serde-reflection = "0.3.2"
-serde-generate = "0.14.0"
+serde-generate = "0.14.1"
 anyhow = "1.0.32"
 regex = "1.3.9"
 structopt = "0.3.17"

diff --git a/language/transaction-builder/generator/Cargo.toml b/language/transaction-builder/generator/Cargo.toml
@@ -15,7 +15,7 @@ regex = "1.3.9"
 structopt = "0.3.17"
 textwrap = "0.12.1"
 serde-reflection = "0.3.2"
-serde-generate = "0.14.0"
+serde-generate = "0.14.1"
 serde_yaml = "0.8.13"
 
 libra-types = { path = "../../../types", version = "0.1.0" }
@@ -25,6 +25,7 @@ lcs = { path = "../../../common/lcs", version = "0.1.0", package = "libra-canoni
 
 [dev-dependencies]
 tempfile = "3.1.0"
+which = "4.0.2"
 
 [features]
 default = []

diff --git a/language/transaction-builder/generator/tests/generation.rs b/language/transaction-builder/generator/tests/generation.rs
@@ -97,6 +97,15 @@ fn test_that_python_code_parses_and_passes_pyre_check() {
 
     let status = Command::new("pyre")
         .current_dir(dir.path())
+        // Work around configuration issue with Pyre 0.0.53
+        .arg("--typeshed")
+        .arg(
+            which::which("pyre")
+                .unwrap()
+                .parent()
+                .unwrap()
+                .join("../lib/pyre_check/typeshed"),
+        )
         .arg("check")
         .status()
         .unwrap();