Skip to content

Commit c93f811

Browse files
committed
updating xeus
1 parent ce5a598 commit c93f811

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

environment-dev.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ dependencies:
77
- cxx-compiler
88
# Host dependencies
99
- nlohmann_json
10-
- xtl
1110
- cppzmq
12-
- xeus-zmq=1.1.1
11+
- xeus>=5.0.0,<=6.0
12+
- xeus-zmq
1313
- sqlite
1414
- sqlitecpp
1515
- cpp-tabulate=1.5
1616
- xvega=0.0.10
17-
- xproperty=0.11.0
17+
- xproperty>=0.12.0
1818
- xvega-bindings=0.0.10
1919
# Test dependencies
2020
- pytest

include/xeus-sqlite/xeus_sqlite_interpreter.hpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ namespace xeus_sqlite
3939
std::string m_db_path;
4040

4141
void configure_impl() override;
42-
nl::json execute_request_impl(int execution_counter,
43-
const std::string& code,
44-
bool silent,
45-
bool store_history,
46-
nl::json user_expressions,
47-
bool allow_stdin) override;
42+
void execute_request_impl(send_reply_callback cb,
43+
int execution_counter,
44+
const std::string& code,
45+
xeus::execute_request_config config,
46+
nl::json user_expressions) override;
4847
nl::json complete_request_impl(const std::string& code,
4948
int cursor_pos) override;
5049
nl::json inspect_request_impl(const std::string& code,

src/xeus_sqlite_interpreter.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,11 @@ namespace xeus_sqlite
368368
}
369369
}
370370

371-
nl::json interpreter::execute_request_impl(int execution_counter,
372-
const std::string& code,
373-
bool /*silent*/,
374-
bool /*store_history*/,
375-
nl::json /*user_expressions*/,
376-
bool /*allow_stdin*/)
371+
void interpreter::execute_request_impl(send_reply_callback cb,
372+
int execution_counter,
373+
const std::string& code,
374+
xeus::execute_request_config /*config*/,
375+
nl::json /*user_expressions*/)
377376
{
378377
std::vector<std::string> traceback;
379378
nl::json jresult;
@@ -446,7 +445,7 @@ namespace xeus_sqlite
446445
publish_execution_error(jresult["ename"], jresult["evalue"], traceback);
447446
traceback.clear();
448447
}
449-
return jresult;
448+
cb(jresult);
450449
}
451450

452451
nl::json interpreter::complete_request_impl(const std::string& raw_code,

0 commit comments

Comments
 (0)