From 7bbc679c76496e9a2aa2895bf64d58c3b6fdd051 Mon Sep 17 00:00:00 2001
From: "Lei, HUANG" <mrsatangel@gmail.com>
Date: Fri, 6 Jan 2023 15:15:41 +0800
Subject: [PATCH] fix: revert script dependenciex

---
 Cargo.lock            | 37 ++++++++++++-------------------------
 src/script/Cargo.toml | 24 +++++++++++-------------
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6260f03a35..5bd56e2555 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5902,7 +5902,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -5912,10 +5912,9 @@ dependencies = [
 [[package]]
 name = "rustpython-codegen"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "ahash 0.7.6",
- "bitflags",
  "indexmap",
  "itertools",
  "log",
@@ -5929,7 +5928,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -5952,7 +5951,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "rustpython-codegen",
  "rustpython-compiler-core",
@@ -5963,7 +5962,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "bincode 1.3.3",
  "bitflags",
@@ -5980,17 +5979,7 @@ dependencies = [
 [[package]]
 name = "rustpython-derive"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
-dependencies = [
- "rustpython-compiler",
- "rustpython-derive-impl",
- "syn",
-]
-
-[[package]]
-name = "rustpython-derive-impl"
-version = "0.0.0"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "indexmap",
  "itertools",
@@ -5998,6 +5987,8 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
+ "rustpython-codegen",
+ "rustpython-compiler",
  "rustpython-compiler-core",
  "rustpython-doc",
  "syn",
@@ -6016,7 +6007,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "ahash 0.7.6",
  "anyhow",
@@ -6028,7 +6019,6 @@ dependencies = [
  "num-traits",
  "phf 0.10.1",
  "phf_codegen 0.10.0",
- "rustc-hash",
  "rustpython-ast",
  "rustpython-compiler-core",
  "thiserror",
@@ -6041,7 +6031,7 @@ dependencies = [
 [[package]]
 name = "rustpython-pylib"
 version = "0.1.0"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "glob",
  "rustpython-compiler-core",
@@ -6051,7 +6041,7 @@ dependencies = [
 [[package]]
 name = "rustpython-stdlib"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "adler32",
  "ahash 0.7.6",
@@ -6079,7 +6069,6 @@ dependencies = [
  "num-bigint",
  "num-complex",
  "num-integer",
- "num-rational",
  "num-traits",
  "num_enum",
  "once_cell",
@@ -6116,7 +6105,7 @@ dependencies = [
 [[package]]
 name = "rustpython-vm"
 version = "0.1.2"
-source = "git+https://github.com/discord9/RustPython?rev=f89b1537#f89b1537b9c789ff566717d1c2ad3d0777cbf5d6"
+source = "git+https://github.com/discord9/RustPython?rev=183e8dab#183e8dabe0027e31630368e36c6be83b5f9cb3f8"
 dependencies = [
  "adler32",
  "ahash 0.7.6",
@@ -6361,7 +6350,6 @@ dependencies = [
  "common-telemetry",
  "common-time",
  "console",
- "crossbeam-utils",
  "datafusion",
  "datafusion-common",
  "datafusion-expr",
@@ -6371,7 +6359,6 @@ dependencies = [
  "futures-util",
  "log-store",
  "mito",
- "once_cell",
  "paste",
  "query",
  "ron",
diff --git a/src/script/Cargo.toml b/src/script/Cargo.toml
index de396749df..273e879953 100644
--- a/src/script/Cargo.toml
+++ b/src/script/Cargo.toml
@@ -23,7 +23,7 @@ python = [
 ]
 
 [dependencies]
-async-trait="0.1"
+async-trait = "0.1"
 catalog = { path = "../catalog" }
 common-catalog = { path = "../common/catalog" }
 common-error = { path = "../common/error" }
@@ -33,28 +33,26 @@ common-recordbatch = { path = "../common/recordbatch" }
 common-telemetry = { path = "../common/telemetry" }
 common-time = { path = "../common/time" }
 console = "0.15"
-crossbeam-utils = "0.8.14"
 datafusion = { workspace = true, optional = true }
 datafusion-common = { workspace = true, optional = true }
 datafusion-expr = { workspace = true, optional = true }
 datafusion-physical-expr = { workspace = true, optional = true }
 datatypes = { path = "../datatypes" }
+futures = "0.3"
 futures-util = "0.3"
-futures="0.3"
-once_cell = "1.17.0"
-paste = { version="1.0", optional = true }
+paste = { version = "1.0", optional = true }
 query = { path = "../query" }
 # TODO(discord9): This is a forked and tweaked version of RustPython, please update it to newest original RustPython After Update toolchain to 1.65
-rustpython-ast = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-codegen = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-compiler = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-compiler-core = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-parser = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-pylib = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537", features = [
+rustpython-ast = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-codegen = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-compiler = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-compiler-core = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-parser = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-pylib = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab", features = [
     "freeze-stdlib",
 ] }
-rustpython-stdlib = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537" }
-rustpython-vm = { git = "https://github.com/discord9/RustPython", optional = true, rev = "f89b1537", features = [
+rustpython-stdlib = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab" }
+rustpython-vm = { git = "https://github.com/discord9/RustPython", optional = true, rev = "183e8dab", features = [
     "default",
     "codegen",
 ] }