Skip to content

Commit 008c432

Browse files
committed
Update jedi dependency
1 parent 7db4a91 commit 008c432

File tree

5 files changed

+8
-34
lines changed

5 files changed

+8
-34
lines changed

pyls/python_ls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ def m_initialize(self, processId=None, rootUri=None, rootPath=None, initializati
152152
if rootUri is None:
153153
rootUri = uris.from_fs_path(rootPath) if rootPath is not None else ''
154154

155+
self.workspace = Workspace(rootUri, self._endpoint)
155156
self.config = config.Config(rootUri, initializationOptions or {}, processId)
156-
self.workspace = Workspace(rootUri, self._endpoint, config=self.config)
157157
self._dispatchers = self._hook('pyls_dispatchers')
158158
self._hook('pyls_initialize')
159159

pyls/workspace.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class Workspace(object):
2121
M_APPLY_EDIT = 'workspace/applyEdit'
2222
M_SHOW_MESSAGE = 'window/showMessage'
2323

24-
def __init__(self, root_uri, endpoint, config=None):
25-
self._config = config
24+
def __init__(self, root_uri, endpoint):
2625
self._root_uri = root_uri
2726
self._endpoint = endpoint
2827
self._root_uri_scheme = uris.urlparse(self._root_uri)[0]
@@ -98,14 +97,12 @@ def _create_document(self, doc_uri, source=None, version=None):
9897
doc_uri, source=source, version=version,
9998
extra_sys_path=self.source_roots(path),
10099
rope_project_builder=self._rope_project_builder,
101-
config=self._config,
102100
)
103101

104102

105103
class Document(object):
106104

107-
def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=None, rope_project_builder=None,
108-
config=None):
105+
def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=None, rope_project_builder=None):
109106
self.uri = uri
110107
self.version = version
111108
self.path = uris.to_fs_path(uri)
@@ -115,7 +112,6 @@ def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=No
115112
self._source = source
116113
self._extra_sys_path = extra_sys_path or []
117114
self._rope_project_builder = rope_project_builder
118-
self._config = config
119115

120116
def __str__(self):
121117
return str(self.uri)
@@ -220,14 +216,9 @@ def jedi_script(self, position=None):
220216
def sys_path(self):
221217
# Copy our extra sys path
222218
path = list(self._extra_sys_path)
223-
settings = self._config.settings() if self._config else {}
224-
225-
python_virtualenv = settings.get('python_virtualenv')
226-
log.debug('Jedi Environment: %s', python_virtualenv)
227-
if python_virtualenv:
228-
environment = jedi.api.environment.create_environment(python_virtualenv, safe=False)
229-
else:
230-
environment = jedi.api.environment.get_cached_default_environment()
219+
220+
# TODO(gatesn): #339 - make better use of jedi environments, they seem pretty powerful
221+
environment = jedi.api.environment.get_cached_default_environment()
231222
path.extend(environment.get_sys_path())
232223

233224
return path

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
'configparser; python_version<"3.0"',
3636
'future>=0.14.0',
3737
'futures; python_version<"3.2"',
38-
'jedi>=0.12',
3938
'python-jsonrpc-server>=0.1.0',
39+
'jedi>=0.13',
4040
'pluggy'
4141
],
4242

test/fixtures.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ def pyls(tmpdir):
3838
@pytest.fixture
3939
def workspace(tmpdir):
4040
"""Return a workspace."""
41-
root_uri = uris.from_fs_path(str(tmpdir))
42-
return Workspace(root_uri, Mock(), config=Config(root_uri, {}, 0))
41+
return Workspace(uris.from_fs_path(str(tmpdir)), Mock())
4342

4443

4544
@pytest.fixture

test/test_document.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# Copyright 2017 Palantir Technologies, Inc.
2-
import jedi
3-
import mock
4-
52
from test.fixtures import DOC_URI, DOC
63
from pyls.workspace import Document
74

@@ -100,16 +97,3 @@ def test_document_end_of_file_edit():
10097
"print 'b'\n",
10198
"o",
10299
]
103-
104-
105-
def test_sys_path_python_virtualenv(config, monkeypatch):
106-
config.update({"python_virtualenv": '/path/to/virtualenv/'})
107-
doc = Document(DOC_URI, DOC, config=config)
108-
get_sys_path_mock = mock.Mock(return_value=['/new/sys/path'])
109-
mocked = mock.Mock(return_value=mock.Mock(get_sys_path=get_sys_path_mock))
110-
with monkeypatch.context():
111-
monkeypatch.setattr(jedi.api.environment, 'create_environment', mocked)
112-
sys_path = doc.sys_path()
113-
assert mocked.call_count == 1
114-
assert '/path/to/virtualenv/' in mocked.call_args[0]
115-
assert '/new/sys/path' in sys_path

0 commit comments

Comments
 (0)