Skip to content

Remove IJMPConnection and uses of it while maintaining same tests #11503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rchiodo merged 2 commits into from
Apr 29, 2020
Merged

Remove IJMPConnection and uses of it while maintaining same tests #11503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c3ffeb
Remove IJMPConnection and uses of it while maintaining same tests
rchiodo Apr 29, 2020
021ddb7
Fix linter error
rchiodo Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/3 Code Health/11470.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove IJMPConnection implementation while maintaining tests written for it.
286 changes: 0 additions & 286 deletions src/client/datascience/raw-kernel/enchannel-zmq-backend-6/index.ts
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions src/client/datascience/raw-kernel/enchannelJMPConnection.ts
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/client/datascience/raw-kernel/rawKernel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import type { Kernel, KernelMessage, ServerConnection } from '@jupyterlab/servic
import * as uuid from 'uuid/v4';
import { isTestExecution } from '../../common/constants';
import { IDisposable } from '../../common/types';
import { noop } from '../../common/utils/misc';
import { IKernelProcess } from '../kernel-launcher/types';
import { IWebSocketLike } from '../kernelSocketWrapper';
import { IKernelSocket } from '../types';
Expand Down Expand Up @@ -107,9 +106,7 @@ export class RawKernel implements Kernel.IKernel {

public shutdown(): Promise<void> {
suppressShutdownErrors(this.realKernel);
return this.realKernel.shutdown().catch((_exc) => {
noop();
});
return this.realKernel.shutdown().then(() => this.kernelProcess.dispose());
}
public getSpec(): Promise<Kernel.ISpecModel> {
return this.realKernel.getSpec();
Expand Down
3 changes: 0 additions & 3 deletions src/client/datascience/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ import { PlotViewer } from './plotting/plotViewer';
import { PlotViewerProvider } from './plotting/plotViewerProvider';
import { PreWarmActivatedJupyterEnvironmentVariables } from './preWarmVariables';
import { ProgressReporter } from './progress/progressReporter';
import { EnchannelJMPConnection } from './raw-kernel/enchannelJMPConnection';
import { RawNotebookProviderWrapper } from './raw-kernel/rawNotebookProviderWrapper';
import { StatusProvider } from './statusProvider';
import { ThemeFinder } from './themeFinder';
Expand All @@ -103,7 +102,6 @@ import {
IInteractiveWindow,
IInteractiveWindowListener,
IInteractiveWindowProvider,
IJMPConnection,
IJupyterCommandFactory,
IJupyterDebugger,
IJupyterExecution,
Expand Down Expand Up @@ -209,7 +207,6 @@ export function registerTypes(serviceManager: IServiceManager) {
serviceManager.addSingleton<NativeEditorSynchronizer>(NativeEditorSynchronizer, NativeEditorSynchronizer);
serviceManager.addSingleton<INotebookProvider>(INotebookProvider, NotebookProvider);
serviceManager.addSingleton<IJupyterServerProvider>(IJupyterServerProvider, NotebookServerProvider);
serviceManager.add<IJMPConnection>(IJMPConnection, EnchannelJMPConnection);
serviceManager.addSingleton<IPyWidgetMessageDispatcherFactory>(IPyWidgetMessageDispatcherFactory, IPyWidgetMessageDispatcherFactory);
serviceManager.addSingleton<IJupyterInterpreterDependencyManager>(IJupyterInterpreterDependencyManager, JupyterInterpreterSubCommandExecutionService);
serviceManager.addSingleton<IJupyterSubCommandExecutionService>(IJupyterSubCommandExecutionService, JupyterInterpreterSubCommandExecutionService);
Expand Down
Loading