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

Use the kernel to check for ipykernel 6 version, instead of the python installer #7689

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

DavidKutu
Copy link

This works for both local and remote.

For #7576

  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
  • Title summarizes what is changing.
  • Has a news entry file (remember to thank yourself!).
  • Appropriate comments and documentation strings in the code.
  • Has sufficient logging.
  • Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated.
  • Test plan is updated as appropriate.
  • package-lock.json has been regenerated by running npm install (if dependencies have changed).

…n installer.

This works for both local and remote.
@DavidKutu DavidKutu requested a review from a team as a code owner September 27, 2021 23:23

const checkCompatible = () =>
this.pythonInstaller.isProductVersionCompatible(Product.ipykernel, '>=6.0.0', interpreter);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for caching or the python installer anymore, this is just faster.

@codecov-commenter
Copy link

Codecov Report

Merging #7689 (802c922) into main (22f866c) will decrease coverage by 0%.
The diff coverage is 61%.

@@          Coverage Diff          @@
##            main   #7689   +/-   ##
=====================================
- Coverage     68%     68%   -1%     
=====================================
  Files        363     363           
  Lines      22582   22590    +8     
  Branches    3435    3437    +2     
=====================================
- Hits       15525   15521    -4     
- Misses      5719    5727    +8     
- Partials    1338    1342    +4     
Impacted Files Coverage Δ
src/client/datascience/jupyter/kernels/types.ts 100% <ø> (ø)
src/client/debugger/jupyter/debuggingManager.ts 59% <56%> (-3%) ⬇️
src/client/datascience/jupyter/kernels/kernel.ts 75% <100%> (+<1%) ⬆️
src/client/debugger/jupyter/kernelDebugAdapter.ts 79% <0%> (-3%) ⬇️
...datascience/editor-integration/codelensprovider.ts 69% <0%> (-2%) ⬇️
src/client/api/pythonApi.ts 62% <0%> (-2%) ⬇️
...datascience/jupyter/liveshare/hostJupyterServer.ts 68% <0%> (-1%) ⬇️
...client/datascience/commands/activeEditorContext.ts 91% <0%> (-1%) ⬇️
...atascience/interactive-window/interactiveWindow.ts 53% <0%> (-1%) ⬇️
... and 3 more

@DavidKutu DavidKutu merged commit 8c5cbef into main Sep 27, 2021
@DavidKutu DavidKutu deleted the david/fixRBLforRemote branch September 27, 2021 23:53
Copy link
Contributor

@DonJayamanne DonJayamanne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the same cehck in startDebugging of JupyterDebugger.ts

@DavidKutu
Copy link
Author

DavidKutu commented Sep 27, 2021

oops, I'll open another PR


if (output[0].text) {
const majorVersion = Number(output[0].text.toString().charAt(0));
const result = majorVersion >= 6;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will work until ipykernel gets to version 10

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OMG, thanks

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in #7695

@DavidKutu DavidKutu mentioned this pull request Sep 28, 2021
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants