Skip to content

Commit a569228

Browse files
committed
cleanup
1 parent 69ab3dc commit a569228

4 files changed

Lines changed: 5 additions & 53 deletions

File tree

.github/workflows/deploy-github-page.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
environment-file: environment-wasm-build.yml
3434
init-shell: bash
3535
environment-name: xeus-python-wasm-build
36-
3736
- name: Set ncpus
3837
run: echo "ncpus=$(nproc --all)" >> $GITHUB_ENV
3938

@@ -51,7 +50,6 @@ jobs:
5150
URL=https://github.com/DerThorsten/xeus-python-shell/archive/refs/heads/libuv.zip
5251
curl -L $URL -o xeus-python-shell-libuv.zip
5352
unzip xeus-python-shell-libuv.zip
54-
5553
5654
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-python-wasm-host
5755
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
@@ -66,9 +64,6 @@ jobs:
6664
6765
emmake make -j${{ env.ncpus }} install
6866
69-
70-
71-
7267
- name: Jupyter Lite integration
7368
shell: bash -l {0}
7469
run: |

.github/workflows/main.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ jobs:
6666
${{ env.CMAKE_EXTRA_ARGS }}
6767
working-directory: build
6868

69-
# - name: Build
70-
# run: cmake --build . --target xeus-python --verbose -j ${{ runner.os == 'macOS' && 3 || 4 }}
71-
# working-directory: build
72-
73-
# - name: Inspect build lib
74-
# run: nm build/libxeus-python.so | grep raw_interpreter
75-
7669
- name: Build all targets
7770
run: cmake --build . --verbose -j ${{ runner.os == 'macOS' && 3 || 4 }}
7871
working-directory: build
@@ -118,7 +111,6 @@ jobs:
118111
shell: cmd /C call {0}
119112
run: pip install git+https://github.com/DerThorsten/xeus-python-shell.git@libuv
120113

121-
122114
- name: Static build option
123115
if: matrix.build_type == 'static_build'
124116
run: |
@@ -163,8 +155,4 @@ jobs:
163155
run: |
164156
test_xeus_python
165157
timeout-minutes: 4
166-
working-directory: build\test
167-
168-
169-
170-
158+
working-directory: build\test

include/xeus-python/xinterpreter.hpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,7 @@ namespace xpyt
101101
bool m_redirect_output_enabled;
102102
bool m_redirect_display_enabled;
103103

104-
private:
105-
106-
// helper methods:
107-
void execute_request_impl_sync(send_reply_callback cb,
108-
int execution_counter,
109-
const std::string& code,
110-
xeus::execute_request_config config,
111-
nl::json user_expressions);
112-
113-
void execute_request_impl_async(send_reply_callback cb,
114-
int execution_counter,
115-
const std::string& code,
116-
xeus::execute_request_config config,
117-
nl::json user_expressions);
118-
104+
private:
119105

120106
virtual void instanciate_ipython_shell();
121107
virtual bool use_jedi_for_completion() const;

src/main.cpp

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,9 @@ int main(int argc, char* argv[])
122122

123123
std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
124124

125-
126-
127-
125+
// we want to use **the same global dict everywhere**
128126
py::dict globals = py::globals();
129127

130-
131-
132-
133128
// Instantiating the xeus xinterpreter
134129
bool raw_mode = xpyt::extract_option("-r", "--raw", argc, argv);
135130
using interpreter_ptr = std::unique_ptr<xeus::xinterpreter>;
@@ -159,11 +154,7 @@ int main(int argc, char* argv[])
159154
debugger_config["python"] = executable;
160155

161156

162-
163-
164-
165-
166-
157+
// Factory to create the debugger with the global dict
167158
auto make_the_debugger = [globals](
168159
xeus::xcontext& context,
169160
const xeus::xconfiguration& config,
@@ -179,15 +170,7 @@ int main(int argc, char* argv[])
179170
session_id,
180171
debugger_config);
181172
};
182-
183-
184-
185-
186-
187-
188-
189-
190-
173+
191174
if (!connection_filename.empty())
192175
{
193176
xeus::xconfiguration config = xeus::load_configuration(connection_filename);

0 commit comments

Comments
 (0)