Update jedi dependency

Author: st4lk

pyls/python_ls.py

@@ -152,8 +152,8 @@ def m_initialize(self, processId=None, rootUri=None, rootPath=None, initializati
         if rootUri is None:
             rootUri = uris.from_fs_path(rootPath) if rootPath is not None else ''
 
+        self.workspace = Workspace(rootUri, self._endpoint)
         self.config = config.Config(rootUri, initializationOptions or {}, processId)
-        self.workspace = Workspace(rootUri, self._endpoint, config=self.config)
         self._dispatchers = self._hook('pyls_dispatchers')
         self._hook('pyls_initialize')
 

pyls/workspace.py

@@ -21,8 +21,7 @@ class Workspace(object):
     M_APPLY_EDIT = 'workspace/applyEdit'
     M_SHOW_MESSAGE = 'window/showMessage'
 
-    def __init__(self, root_uri, endpoint, config=None):
-        self._config = config
+    def __init__(self, root_uri, endpoint):
         self._root_uri = root_uri
         self._endpoint = endpoint
         self._root_uri_scheme = uris.urlparse(self._root_uri)[0]
@@ -98,14 +97,12 @@ def _create_document(self, doc_uri, source=None, version=None):
             doc_uri, source=source, version=version,
             extra_sys_path=self.source_roots(path),
             rope_project_builder=self._rope_project_builder,
-            config=self._config,
         )
 
 
 class Document(object):
 
-    def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=None, rope_project_builder=None,
-                 config=None):
+    def __init__(self, uri, source=None, version=None, local=True, extra_sys_path=None, rope_project_builder=None):
         self.uri = uri
         self.version = version
         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
         self._source = source
         self._extra_sys_path = extra_sys_path or []
         self._rope_project_builder = rope_project_builder
-        self._config = config
 
     def __str__(self):
         return str(self.uri)
@@ -220,14 +216,9 @@ def jedi_script(self, position=None):
     def sys_path(self):
         # Copy our extra sys path
         path = list(self._extra_sys_path)
-        settings = self._config.settings() if self._config else {}
-
-        python_virtualenv = settings.get('python_virtualenv')
-        log.debug('Jedi Environment: %s', python_virtualenv)
-        if python_virtualenv:
-            environment = jedi.api.environment.create_environment(python_virtualenv, safe=False)
-        else:
-            environment = jedi.api.environment.get_cached_default_environment()
+
+        # TODO(gatesn): #339 - make better use of jedi environments, they seem pretty powerful
+        environment = jedi.api.environment.get_cached_default_environment()
         path.extend(environment.get_sys_path())
 
         return path

setup.py

@@ -35,8 +35,8 @@
         'configparser; python_version<"3.0"',
         'future>=0.14.0',
         'futures; python_version<"3.2"',
-        'jedi>=0.12',
         'python-jsonrpc-server>=0.1.0',
+        'jedi>=0.13',
         'pluggy'
     ],
 

test/fixtures.py

@@ -38,8 +38,7 @@ def pyls(tmpdir):
 @pytest.fixture
 def workspace(tmpdir):
     """Return a workspace."""
-    root_uri = uris.from_fs_path(str(tmpdir))
-    return Workspace(root_uri, Mock(), config=Config(root_uri, {}, 0))
+    return Workspace(uris.from_fs_path(str(tmpdir)), Mock())
 
 
 @pytest.fixture

test/test_document.py

@@ -1,7 +1,4 @@
 # Copyright 2017 Palantir Technologies, Inc.
-import jedi
-import mock
-
 from test.fixtures import DOC_URI, DOC
 from pyls.workspace import Document
 
@@ -100,16 +97,3 @@ def test_document_end_of_file_edit():
         "print 'b'\n",
         "o",
     ]
-
-
-def test_sys_path_python_virtualenv(config, monkeypatch):
-    config.update({"python_virtualenv": '/path/to/virtualenv/'})
-    doc = Document(DOC_URI, DOC, config=config)
-    get_sys_path_mock = mock.Mock(return_value=['/new/sys/path'])
-    mocked = mock.Mock(return_value=mock.Mock(get_sys_path=get_sys_path_mock))
-    with monkeypatch.context():
-        monkeypatch.setattr(jedi.api.environment, 'create_environment', mocked)
-        sys_path = doc.sys_path()
-    assert mocked.call_count == 1
-    assert '/path/to/virtualenv/' in mocked.call_args[0]
-    assert '/new/sys/path' in sys_path