Skip to content
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.

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

Kernel finding refactor #4995

Merged
merged 95 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from 93 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
6f04d75
New idea for kernel finding
rchiodo Feb 20, 2021
705304f
Getting some more of the tests running
rchiodo Feb 20, 2021
bf7eac3
Move interpreters down to the finder level
rchiodo Feb 22, 2021
9906772
Partially building
rchiodo Feb 22, 2021
986e5a0
Change when extensions load
rchiodo Feb 22, 2021
76cf7ae
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Feb 24, 2021
b94321c
Fix some merge problems
rchiodo Feb 24, 2021
c87db7c
Fix everything except the kernel selector tests
rchiodo Feb 24, 2021
b78e459
Remove some more code
rchiodo Feb 24, 2021
18bf51a
Remove some more methods
rchiodo Feb 24, 2021
b964fe0
REname build steps
rchiodo Feb 25, 2021
256c303
Get everything building
rchiodo Feb 25, 2021
2d842cb
Outline for tests for kernel finders
rchiodo Feb 25, 2021
5f93502
First local kernel finder test
rchiodo Feb 25, 2021
2bfe766
More tests and handling kernelspecs from interpreters
rchiodo Feb 26, 2021
1dd0f68
Fix build errors
rchiodo Feb 26, 2021
4ddf67d
List kernels passing
rchiodo Feb 26, 2021
d0938dc
Get all local kernel finder tests to pass
rchiodo Feb 26, 2021
4742f81
Add remote tests
rchiodo Feb 27, 2021
7787373
Rework unit tests for jupyterKernelService
rchiodo Mar 1, 2021
365aab1
kernel service unit tests passing
rchiodo Mar 1, 2021
7474eb2
Fix sub command unit tests
rchiodo Mar 1, 2021
7e8c5c5
Fix other tests and eliminate unnecessary test for selections
rchiodo Mar 1, 2021
5976788
Fix execution unit tests
rchiodo Mar 1, 2021
e9434ef
Fix display of kernels
rchiodo Mar 2, 2021
05565bb
Remove dupes that were registered
rchiodo Mar 2, 2021
2d0727e
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 2, 2021
653e618
Turn on linting
rchiodo Mar 2, 2021
2dc3eb7
Format documents that were missed
rchiodo Mar 2, 2021
f4af24a
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 2, 2021
70e395a
Fix build problems
rchiodo Mar 2, 2021
6f749a0
Code review comments
rchiodo Mar 2, 2021
660f350
Add telemetry for kernel retry
rchiodo Mar 2, 2021
a14b68d
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 2, 2021
6a82ce8
Add in cancel token and remove unnecessary code
rchiodo Mar 2, 2021
a91daab
Fix having no interpreter
rchiodo Mar 2, 2021
1e3e141
Fix realpath on Unix
rchiodo Mar 2, 2021
119536e
More kernel test fixes
rchiodo Mar 3, 2021
3e3a42a
More review feedback and eliminate jupyter tests from functional. The…
rchiodo Mar 3, 2021
dc4bef1
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 3, 2021
af89fa9
More tests to eliminate
rchiodo Mar 3, 2021
c9df5b3
More tests to skip
rchiodo Mar 3, 2021
52763f3
Put launch.json back
rchiodo Mar 3, 2021
c8d0281
Fix build error
rchiodo Mar 3, 2021
92bc721
Fix build error
rchiodo Mar 3, 2021
d45b230
Fix sorting for interpreter based kernels
rchiodo Mar 3, 2021
4dd9ac8
Use endswith instead of includes
rchiodo Mar 3, 2021
4fbd395
Need user writable location for jupyter kernels
rchiodo Mar 3, 2021
bd0fbca
Update comment
rchiodo Mar 3, 2021
fe4fc9e
Update linter
rchiodo Mar 3, 2021
b251318
Put back skip for tests
rchiodo Mar 3, 2021
2d476e1
Notebook metadata not required for a match
rchiodo Mar 3, 2021
9cfa84a
Add more logging
rchiodo Mar 3, 2021
30ceebc
More logging and disabling more jupyter tests
rchiodo Mar 3, 2021
8ff9371
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 3, 2021
fb5c1d9
Put back getRealPath function. Behavior of nodejs func is different a…
rchiodo Mar 3, 2021
c588591
Skip real path for mac/linux
rchiodo Mar 3, 2021
d742434
Fix unit tests and output more information on failures
rchiodo Mar 3, 2021
aa052a6
Make sure true kernel name is in the notebook
rchiodo Mar 4, 2021
e8dacf3
Get remote working
rchiodo Mar 4, 2021
2c14955
Fix linter
rchiodo Mar 4, 2021
6fb6d20
Fix problem when no kernel entry in notebook
rchiodo Mar 4, 2021
2cb2779
Fix smoke test and add more logging for vscode tests
rchiodo Mar 4, 2021
0bf2967
More logging and some waiting for a kernel to actually switch
rchiodo Mar 5, 2021
d67d994
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 5, 2021
d5a9d32
Put open file back
rchiodo Mar 5, 2021
6256e6a
More logging and change kernelspec name to be valid path
rchiodo Mar 5, 2021
e9f4f8e
Add more logging
rchiodo Mar 5, 2021
7a43a26
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 5, 2021
9f1d5f4
Fix id to be unique
rchiodo Mar 5, 2021
396b659
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 5, 2021
17ae07e
Update comment to force another run
rchiodo Mar 5, 2021
3dd535f
Update linter
rchiodo Mar 5, 2021
c5358bc
Use the unique id to compare kernels for equality
rchiodo Mar 6, 2021
c423e7b
Fix remote id problems
rchiodo Mar 6, 2021
a00f671
More logging and more precise on matches for switch
rchiodo Mar 6, 2021
cf35268
More logging and try using label
rchiodo Mar 8, 2021
c9190b9
Try more logging
rchiodo Mar 8, 2021
828818f
Fix prettier
rchiodo Mar 8, 2021
63b6de9
Add a bunch more logging
rchiodo Mar 8, 2021
de755f9
Switch doesn't seem to happen before execute
rchiodo Mar 8, 2021
a3a81ff
Track kernel data in the document before starting the notebook
rchiodo Mar 8, 2021
72393ec
More logging
rchiodo Mar 8, 2021
24ffc4b
Merge remote-tracking branch 'origin/main' into rchiodo/refactor_kern…
rchiodo Mar 8, 2021
2d345d1
Disable failing tests on jupyter
rchiodo Mar 8, 2021
495f1e8
Fix bug with changing kernel
rchiodo Mar 8, 2021
2046803
Skip install when non raw
rchiodo Mar 8, 2021
f2e3756
Figure out correct kernel names
rchiodo Mar 8, 2021
3aee89e
Resolve name during test
rchiodo Mar 8, 2021
f7c7d74
Wrong kernel name
rchiodo Mar 8, 2021
0fc7ac4
Use includes in kernel search too
rchiodo Mar 8, 2021
4f1981f
Try interpreter path instead
rchiodo Mar 8, 2021
9d450e1
Fix tryGetRealPath to actually wait for the result
rchiodo Mar 9, 2021
6d04abd
More tracing and other review feedback
rchiodo Mar 9, 2021
9e18557
FIx comment on remoteKernelFinder
rchiodo Mar 9, 2021
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
7 changes: 0 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,12 @@ module.exports = {
'src/test/datascience/mockLanguageServerCache.ts',
'src/test/datascience/debugLocationTracker.unit.test.ts',
'src/test/datascience/mockLiveShare.ts',
'src/test/datascience/liveshare.functional.test.tsx',
'src/test/datascience/mountedWebViewFactory.ts',
'src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts',
'src/test/datascience/mockPythonService.ts',
'src/test/datascience/testHelpersCore.ts',
'src/test/datascience/shiftEnterBanner.unit.test.ts',
'src/test/datascience/executionServiceMock.ts',
'src/test/datascience/mockJupyterManager.ts',
'src/test/datascience/mockCommandManager.ts',
'src/test/datascience/mockCustomEditorService.ts',
'src/test/datascience/mockInputBox.ts',
Expand Down Expand Up @@ -258,7 +256,6 @@ module.exports = {
'src/test/datascience/testHelpers.tsx',
'src/test/datascience/mockLanguageClient.ts',
'src/test/datascience/errorHandler.functional.test.tsx',
'src/test/datascience/notebook/notebookStorage.unit.test.ts',
'src/test/datascience/notebook/notebookTrust.native.vscode.test.ts',
'src/test/datascience/notebook/survey.unit.test.ts',
'src/test/datascience/notebook/interrupRestart.native.vscode.test.ts',
Expand All @@ -278,14 +275,12 @@ module.exports = {
'src/test/datascience/markdownManipulation.unit.test.ts',
'src/test/datascience/interactivePanel.functional.test.tsx',
'src/test/datascience/testPersistentStateFactory.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.unit.test.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterStateStore.unit.test.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterService.unit.test.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterSelectionCommand.unit.test.ts',
'src/test/datascience/jupyter/interpreter/jupyterInterpreterSelector.unit.test.ts',
'src/test/datascience/jupyter/serverSelector.unit.test.ts',
'src/test/datascience/jupyter/kernels/kernelSwitcher.unit.test.ts',
'src/test/datascience/jupyter/jupyterCellOutputMimeTypeTracker.unit.test.ts',
'src/test/datascience/jupyter/jupyterConnection.unit.test.ts',
'src/test/datascience/jupyter/serverCache.unit.test.ts',
Expand Down Expand Up @@ -736,7 +731,6 @@ module.exports = {
'src/client/common/process/internal/python.ts',
'src/client/common/process/internal/scripts/testing_tools.ts',
'src/client/common/process/internal/scripts/vscode_datascience_helpers.ts',
'src/client/common/process/internal/scripts/index.ts',
'src/client/common/process/pythonDaemonPool.ts',
'src/client/common/process/logger.ts',
'src/client/common/process/constants.ts',
Expand Down Expand Up @@ -930,7 +924,6 @@ module.exports = {
'src/client/datascience/jupyter/interpreter/jupyterInterpreterOldCacheStateStore.ts',
'src/client/datascience/jupyter/interpreter/jupyterInterpreterSelector.ts',
'src/client/datascience/jupyter/interpreter/jupyterInterpreterService.ts',
'src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts',
'src/client/datascience/jupyter/jupyterExecutionFactory.ts',
'src/client/datascience/jupyter/jupyterRequest.ts',
'src/client/datascience/jupyter/commandLineSelector.ts',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# We use the github.event_name to determine what started the workflow to determine which
# situation we are in.

name: Main
name: Build and Test

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-insiders.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish For Insiders
name: Publish Insiders

on:
# schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Extension
name: Publish Release

on:
# Allow dispatch so can publish from github actions
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ debugpy*.log
pydevd*.log
nodeLanguageServer/**
nodeLanguageServer.*/**
src/test/datascience/.venv*
Loading