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

Always use the same jedi environment #4687

Merged
merged 2 commits into from
Mar 20, 2019
Merged

Conversation

selimb
Copy link

@selimb selimb commented Mar 8, 2019

Fix completion.py to always pass the same environment to jedi, instead of letting it infer a default one.

For #4504

  • 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.

Fix completion.py to always pass the same environment to jedi, instead of letting it infer a default one.

Fixes microsoft#4505
@codecov
Copy link

codecov bot commented Mar 8, 2019

Codecov Report

Merging #4687 into master will decrease coverage by 1%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           master   #4687     +/-   ##
========================================
- Coverage      77%     77%    -<1%     
========================================
  Files         447     449      +2     
  Lines       21343   22892   +1549     
  Branches     3491    3800    +309     
========================================
+ Hits        16344   17401   +1057     
- Misses       4995    5471    +476     
- Partials        4      20     +16
Flag Coverage Δ
#Linux 66% <ø> (+1%) ⬆️
#Windows 66% <ø> (+1%) ⬆️
#macOS 66% <ø> (+1%) ⬆️

@selimb
Copy link
Author

selimb commented Mar 8, 2019

This fixes #4504 . I'd be happy to add tests, but I'm not exactly sure how yet. As far as I can tell, the only provider that triggers this call is the symbolProvider. However, I'm not sure how to test this in the associated test file (symbolProvider.unit.test.js). Any suggestions?

@DonJayamanne
Copy link

Closing & re-opening to ensure Travis CI kicks in

@DonJayamanne
Copy link

Closing & re-opening to ensure Travis CI kicks in

@DonJayamanne DonJayamanne reopened this Mar 20, 2019
@DonJayamanne DonJayamanne self-assigned this Mar 20, 2019
@DonJayamanne DonJayamanne marked this pull request as ready for review March 20, 2019 17:38
@DonJayamanne
Copy link

Closing & re-opening to ensure Travis CI kicks in

@msftclas
Copy link

msftclas commented Mar 20, 2019

CLA assistant check
All CLA requirements met.

@DonJayamanne DonJayamanne merged commit 77995ff into microsoft:master Mar 20, 2019
DonJayamanne added a commit that referenced this pull request Mar 20, 2019
DonJayamanne added a commit that referenced this pull request Mar 20, 2019
@DonJayamanne
Copy link

DonJayamanne commented Mar 20, 2019

@selimb I accidentally merged your PR, and had to revert the commit.
Please could you accept the License Agreement (above).
Once done, I can revert the revert to the commit :)

@selimb
Copy link
Author

selimb commented Mar 22, 2019

@DonJayamanne thanks for the approval! I'm just waiting on permission from my employer to sign the agreement.

@selimb
Copy link
Author

selimb commented Mar 22, 2019

@DonJayamanne Done!
Cheers.

DonJayamanne added a commit that referenced this pull request Mar 22, 2019
DonJayamanne added a commit that referenced this pull request Mar 25, 2019
DonJayamanne added a commit that referenced this pull request Mar 29, 2019
* Update tpn distro and 3rd party notices

* Pin to beta version of PTVSD (#4836)

Update version of PTVSD

* Add ignore button to the MacInterpreterSelectedAndNoOtherInterpreters… (#4808)

Add ignore button to the MacInterpreterSelectedAndNoOtherInterpretersDiagnostic & MacInterpreterSelectedAndHaveOtherInterpretersDiagnostic diagnostic message to provide the ability to opt out of the warning. (Fixing related issue #4448)

* Generalize test results service (#4813)

* Generalize test results service

* News entry

* Fix gulp errors

* Updated status icons

* Added tests

* fix names for run above and run below code lenses (#4879)

* Fix multiline comments with text on first line. (#4884)

* Cherry-pick 26a7b9c

* cherry pick from master branch

* Revert "Revert "Always use the same jedi environment (#4687)" (#4850)"

This reverts commit 0268ef4.

* Update change log entries

* Bump ptvsd to 4.2.5 (#4904)

* Bump version of PTVSD to 4.2.5
* Changes to capabilities

* Ensure output panel does not steal focus due to ls errors (#4919)

For #4868

<!--
  If an item below does not apply to you, then go ahead and check it off as "done" and strikethrough the text, e.g.:
    - [x] ~Has unit tests & system/integration tests~
-->
- [x] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
- [x] Title summarizes what is changing
- [x] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/master/news) file (remember to thank yourself!)
- [n/a] Has sufficient logging.
- [n/a] Has telemetry for enhancements.
- [n/a] Unit tests & system/integration tests are added/updated
- [n/a] [Test plan](https://github.com/Microsoft/vscode-python/blob/master/.github/test_plan.md) is updated as appropriate
- [n/a] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed)
- [n/a] The wiki is updated with any design decisions/details.

* Fix change log

* Bump pinned version of Language Server

* Release for march 2018 (#4931)

* New version
* Updated change log

* Same logic for stable and beta (#4964)

* Point release for March 2018 (#4965)

* Capture telemetry when tests are disabled (#4997)

For #4801

* Update change log
DonJayamanne added a commit that referenced this pull request Apr 4, 2019
* release:
  March 2019 point release with debugger fixes (#5056)
  Update change log
  Capture telemetry when tests are disabled (#4997)
  Point release for March 2018 (#4965)
  Same logic for stable and beta (#4964)
  Release for march 2018 (#4931)
  Bump pinned version of Language Server
  Fix change log
  Ensure output panel does not steal focus due to ls errors (#4919)
  Bump ptvsd to 4.2.5 (#4904)
  Update change log entries
  Revert "Revert "Always use the same jedi environment (#4687)" (#4850)"
  cherry pick from master branch
  Cherry-pick 26a7b9c
  Fix multiline comments with text on first line. (#4884)
  fix names for run above and run below code lenses (#4879)
  Generalize test results service (#4813)
  Add ignore button to the MacInterpreterSelectedAndNoOtherInterpreters… (#4808)
  Pin to beta version of PTVSD (#4836)
  Update tpn distro and 3rd party notices
DonJayamanne added a commit that referenced this pull request Apr 8, 2019
* release: (24 commits)
  Bump extension version
  Bump language server
  Track telemetry when switching to and from LS (#5164)
  Point release with fixes for Debugger (#5160)
  March 2019 point release with debugger fixes (#5056)
  Update change log
  Capture telemetry when tests are disabled (#4997)
  Point release for March 2018 (#4965)
  Same logic for stable and beta (#4964)
  Release for march 2018 (#4931)
  Bump pinned version of Language Server
  Fix change log
  Ensure output panel does not steal focus due to ls errors (#4919)
  Bump ptvsd to 4.2.5 (#4904)
  Update change log entries
  Revert "Revert "Always use the same jedi environment (#4687)" (#4850)"
  cherry pick from master branch
  Cherry-pick 26a7b9c
  Fix multiline comments with text on first line. (#4884)
  fix names for run above and run below code lenses (#4879)
  ...
@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.

3 participants