Skip to content

run modules plain if running as jupyter modules doesn't work#4763

Merged
IanMatthewHuff merged 1 commit intomicrosoft:masterfrom
IanMatthewHuff:dev/ianhu/fixModuleCommands
Mar 14, 2019
Merged

run modules plain if running as jupyter modules doesn't work#4763
IanMatthewHuff merged 1 commit intomicrosoft:masterfrom
IanMatthewHuff:dev/ianhu/fixModuleCommands

Conversation

@IanMatthewHuff
Copy link
Copy Markdown
Member

For #4306

  • 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!)
  • 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)
  • The wiki is updated with any design decisions/details.

@IanMatthewHuff IanMatthewHuff requested a review from rchiodo March 14, 2019 15:44
}

private doesModuleExist = async (module: string, interpreter: PythonInterpreter, cancelToken?: CancellationToken): Promise<boolean> => {
private doesModuleExist = async (moduleName: string, interpreter: PythonInterpreter, cancelToken?: CancellationToken): Promise<ModuleExistsResult> => {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

just swapped moduleName as module shows up as keyword coloring.

// Our command args are different based on the command. ipykernel is not a jupyter command
const args = command === JupyterCommands.KernelCreateCommand ? ['-m', command] : ['-m', 'jupyter', command];
return this.commandFactory.createInterpreterCommand(args, interpreter);
if (exists === ModuleExistsResult.FoundJupyter) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

=== [](start = 23, length = 3)

Nice. This is way simpler than I thought it was going to be.

Copy link
Copy Markdown

@rchiodo rchiodo left a comment

Choose a reason for hiding this comment

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

:shipit:

@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 14, 2019

Codecov Report

Merging #4763 into master will increase coverage by 1%.
The diff coverage is 77%.

@@          Coverage Diff           @@
##           master   #4763   +/-   ##
======================================
+ Coverage      77%     77%   +1%     
======================================
  Files         449     449           
  Lines       21650   21708   +58     
  Branches     3552    3572   +20     
======================================
+ Hits        16608   16668   +60     
+ Misses       5038    5036    -2     
  Partials        4       4
Flag Coverage Δ
#Linux 66% <43%> (+1%) ⬆️
#Windows 66% <43%> (+1%) ⬆️
#macOS 66% <43%> (+1%) ⬆️

@IanMatthewHuff IanMatthewHuff merged commit 81a079c into microsoft:master Mar 14, 2019
@IanMatthewHuff IanMatthewHuff deleted the dev/ianhu/fixModuleCommands branch March 14, 2019 19:23
@lock lock Bot locked as resolved and limited conversation to collaborators Jul 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants