Remove redundant files #14620
Merged
Remove redundant files #14620
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joyceerhl
requested review from
IanMatthewHuff,
DonJayamanne,
rchiodo and
DavidKutu
|
Kudos, SonarCloud Quality Gate passed!
|
Codecov Report
@@ Coverage Diff @@
## main #14620 +/- ##
==========================================
+ Coverage 65.08% 65.10% +0.01%
==========================================
Files 541 541
Lines 25377 25377
Branches 3587 3587
==========================================
+ Hits 16516 16521 +5
+ Misses 8179 8178 -1
+ Partials 682 678 -4
Continue to review full report at Codecov.
|
|
@joyceerhl Should this go in the release branch as well? |
|
Hmm, that's a bit odd. The language service stuff came in late so must have accidentally been merged back to datascience. I might have done that, will look at the history. |
IanMatthewHuff
approved these changes
Nov 5, 2020
|
Actually no. I'm not seeing a mismerge. I think it was just on the DS removal I totally cleared the datascience directory, but at the same time there were language server changes in that directory, maybe in the release branch? So we ended up with the dupes in main. |
|
@karthiknadig not strictly necessary, as this PR only removes some unused code. It doesn't alter behavior. |
rchiodo
approved these changes
Nov 5, 2020
karthiknadig
approved these changes
Nov 5, 2020
karthiknadig
pushed a commit
to karthiknadig/vscode-python
that referenced
this pull request
Nov 6, 2020
karthiknadig
added a commit
that referenced
this pull request
Nov 6, 2020
* Update shipped wheels version (#14615) * Update shipped wheels version * News item * Remove redundant files (#14620) * Add extension dependencies at build time (#14636) * Use Node 12.15 in Insiders and Release GitHub Actions (#14641) * Use Node 12.15 on all Insiders and Release GitHub Actions jobs (#14642) Co-authored-by: Joyce Er <[email protected]>
karthiknadig
added a commit
that referenced
this pull request
Nov 26, 2020
* Cherry pick from main (#14644) * Update shipped wheels version (#14615) * Update shipped wheels version * News item * Remove redundant files (#14620) * Add extension dependencies at build time (#14636) * Use Node 12.15 in Insiders and Release GitHub Actions (#14641) * Use Node 12.15 on all Insiders and Release GitHub Actions jobs (#14642) Co-authored-by: Joyce Er <[email protected]> * Cherry pic fixes into release for tests. (#14673) * Added FSWatching base class and made related changes (#14605) * Add FSWatching locator base class * Correct glob pattern to not match python3.2whoa * Add documentation of python binary watcher * Fix lint errors * Update ignore list * Add disposable registry * Modify FSWatching Locator * Code reviews * Use string[] * Remove list disposable getter * Fix failing global virtual env watcher tests (#14633) Co-authored-by: Kartik Raj <[email protected]> * Version, change log and cherrypicks for nov release (#14696) * change log updates * Update gifs * Fix for interpreter selection (#14693) * Fix for interpreter selection * Fix linting errors * Minor tweak to property removal * Cherry pick "Bind function to correct this for workspace syms" (#14743) * Fix #14674: Enable overriding "pythonPath" in the launcher Fix #12462: Update launch.json schema to add "python" and remove "pythonPath" Split the "pythonPath" debug property into "python", "debugAdapterPython", and "debugLauncherPython". Do most debug config validation on fully expanded property values via resolveDebugConfigurationWithSubstitutedVariables(). Add fixups for legacy launch.json with "pythonPath". * Point release change log and version update (#14750) * Point release change log and version update * Fix process picker (#14700) * Workaround VSCode bug for process picker * Fix how we pass in icons to VSCode * update change log with cherry pick Co-authored-by: Kartik Raj <[email protected]> Co-authored-by: Joyce Er <[email protected]> Co-authored-by: Kartik Raj <[email protected]> Co-authored-by: Jake Bailey <[email protected]> Co-authored-by: Pavel Minaev <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The src/client/datascience/api/jupyterIntegration.ts file seems to be a dupe of src/client/jupyter/jupyterIntegration.ts. IIRC we wanted to remove src/client/datascience altogether. Also we don't seem to be using src/test/datascience/mockJupyterExtensionIntegration.ts.
package-lock.jsonhas been regenerated by runningnpm install(if dependencies have changed).