Skip to content

Commit

Permalink
Upgrade Jedi to version 0.13.3. (microsoft#6317)
Browse files Browse the repository at this point in the history
(for microsoft#6013)

Note that the update to the change log is a one-off for the sake of whoever does the July release. They will adjust as needed. :)
  • Loading branch information
ericsnowcurrently authored Jun 25, 2019
1 parent 54f2e98 commit aab1520
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 15 deletions.
57 changes: 57 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,62 @@
# Changelog


## master

\<TBD>

### Thanks

Thanks to the following projects which we fully rely on to provide some of
our features:
- [isort](https://pypi.org/project/isort/)
- [jedi](https://pypi.org/project/jedi/)
and [parso](https://pypi.org/project/parso/)
- [Microsoft Python Language Server](https://github.com/microsoft/python-language-server)
- [ptvsd](https://pypi.org/project/ptvsd/)
- [exuberant ctags](http://ctags.sourceforge.net/) (user-installed)
- [rope](https://pypi.org/project/rope/) (user-installed)

Also thanks to the various projects we provide integrations with which help
make this extension useful:
- Debugging support:
[Django](https://pypi.org/project/Django/),
[Flask](https://pypi.org/project/Flask/),
[gevent](https://pypi.org/project/gevent/),
[Jinja](https://pypi.org/project/Jinja/),
[Pyramid](https://pypi.org/project/pyramid/),
[PySpark](https://pypi.org/project/pyspark/),
[Scrapy](https://pypi.org/project/Scrapy/),
[Watson](https://pypi.org/project/Watson/)
- Formatting:
[autopep8](https://pypi.org/project/autopep8/),
[black](https://pypi.org/project/black/),
[yapf](https://pypi.org/project/yapf/)
- Interpreter support:
[conda](https://conda.io/),
[direnv](https://direnv.net/),
[pipenv](https://pypi.org/project/pipenv/),
[pyenv](https://github.com/pyenv/pyenv),
[venv](https://docs.python.org/3/library/venv.html#module-venv),
[virtualenv](https://pypi.org/project/virtualenv/)
- Linting:
[bandit](https://pypi.org/project/bandit/),
[flake8](https://pypi.org/project/flake8/),
[mypy](https://pypi.org/project/mypy/),
[prospector](https://pypi.org/project/prospector/),
[pylint](https://pypi.org/project/pylint/),
[pydocstyle](https://pypi.org/project/pydocstyle/),
[pylama](https://pypi.org/project/pylama/)
- Testing:
[nose](https://pypi.org/project/nose/),
[pytest](https://pypi.org/project/pytest/),
[unittest](https://docs.python.org/3/library/unittest.html#module-unittest)

And finally thanks to the [Python](https://www.python.org/) development team and
community for creating a fantastic programming language and community to be a
part of!


## 2019.6.0-rc (19 June 2019)

### Enhancements
Expand Down
8 changes: 4 additions & 4 deletions ThirdPartyNotices-Distribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Microsoft Python extension for Visual Studio Code incorporates third party mater
191. isarray 1.0.0 (https://github.com/juliangruber/isarray/blob/v1.0.0)
192. isort 4.3.4 (https://github.com/timothycrosley/isort/tree/4.3.4)
193. isstream 0.1.2 (https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz)
194. Jedi 0.12.0 (https://github.com/davidhalter/jedi/tree/v0.12.0)
194. Jedi 0.13.3 (https://github.com/davidhalter/jedi/tree/v0.13.3)
195. jquery 3.4.1 (https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz)
196. jquery-ui 1.12.1 (https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz)
197. js-tokens 3.0.2 (https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz)
Expand Down Expand Up @@ -267,7 +267,7 @@ Microsoft Python extension for Visual Studio Code incorporates third party mater
260. os-browserify 0.3.0 (https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz)
261. os-tmpdir 1.0.2 (https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz)
262. parse-entities 1.2.0 (https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz)
263. parso 0.2.1 (https://github.com/davidhalter/parso/tree/v0.2.1)
263. parso 0.5.0 (https://github.com/davidhalter/parso/tree/v0.5.0)
264. path-browserify 0.0.0 (https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz)
265. path-is-absolute 1.0.1 (https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz)
266. path-parse 1.0.5 (https://github.com/jbgutierrez/path-parse)
Expand Down Expand Up @@ -6111,7 +6111,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
=========================================
END OF isstream NOTICES AND INFORMATION

%% Jedi 0.12.0 NOTICES AND INFORMATION BEGIN HERE (https://github.com/davidhalter/jedi/tree/v0.12.0)
%% Jedi 0.13.3 NOTICES AND INFORMATION BEGIN HERE (https://github.com/davidhalter/jedi/tree/v0.13.3)
=========================================
All contributions towards Jedi are MIT licensed.

Expand Down Expand Up @@ -8335,7 +8335,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=========================================
END OF parse-entities NOTICES AND INFORMATION

%% parso 0.2.1 NOTICES AND INFORMATION BEGIN HERE (https://github.com/davidhalter/parso/tree/v0.2.1)
%% parso 0.5.0 NOTICES AND INFORMATION BEGIN HERE (https://github.com/davidhalter/parso/tree/v0.5.0)
=========================================
All contributions towards parso are MIT licensed.

Expand Down
1 change: 1 addition & 0 deletions news/3 Code Health/6013.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade Jedi to version 0.13.3.
12 changes: 7 additions & 5 deletions pythonFiles/completion.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class JediCompletion(object):

def __init__(self):
self.default_sys_path = sys.path
self.environment = jedi.api.environment.Environment(sys.prefix, sys.executable)
self._input = io.open(sys.stdin.fileno(), encoding='utf-8')
if (os.path.sep == '/') and (platform.uname()[2].find('Microsoft') > -1):
# WSL; does not support UNC paths
Expand Down Expand Up @@ -563,13 +562,16 @@ def _process_request(self, request):
source=request.get('source', None),
path=request.get('path', ''),
all_scopes=True,
environment=self.environment),
),
request['id'])

script = jedi.Script(
source=request.get('source', None), line=request['line'] + 1,
column=request['column'], path=request.get('path', ''),
sys_path=sys.path, environment=self.environment)
source=request.get('source', None),
line=request['line'] + 1,
column=request['column'],
path=request.get('path', ''),
sys_path=sys.path,
)

if lookup == 'definitions':
defs = self._get_definitionsx(script.goto_assignments(follow_imports=True), request['id'])
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jedi==0.12.0
parso==0.2.1
jedi==0.13.3
parso==0.5.0
isort==4.3.20
ptvsd==4.2.10
8 changes: 4 additions & 4 deletions tpn/distribution.toml
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

[[project]]
name = "Jedi"
version = "0.12.0"
url = "https://github.com/davidhalter/jedi/tree/v0.12.0"
version = "0.13.3"
url = "https://github.com/davidhalter/jedi/tree/v0.13.3"
purpose = "PyPI"
license = """
All contributions towards Jedi are MIT licensed.
Expand Down Expand Up @@ -1234,8 +1234,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

[[project]]
name = "parso"
version = "0.2.1"
url = "https://github.com/davidhalter/parso/tree/v0.2.1"
version = "0.5.0"
url = "https://github.com/davidhalter/parso/tree/v0.5.0"
purpose = "PyPI"
license = """
All contributions towards parso are MIT licensed.
Expand Down

0 comments on commit aab1520

Please sign in to comment.