From b91203820c81c871dbf7f89c7f8dd246a0d1e890 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 4 Aug 2018 02:00:13 +0200 Subject: [PATCH] Now it's actually possible to specify a pytest environment for the same Python version --- conftest.py | 6 +----- jedi/evaluate/compiled/subprocess/__init__.py | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/conftest.py b/conftest.py index d7175e24..1b49c2b9 100644 --- a/conftest.py +++ b/conftest.py @@ -6,8 +6,7 @@ from functools import partial import pytest import jedi -from jedi.api.environment import get_default_environment, \ - get_system_environment, InterpreterEnvironment +from jedi.api.environment import get_system_environment, InterpreterEnvironment from jedi._compatibility import py_version collect_ignore = [ @@ -98,9 +97,6 @@ def environment(request): if version is None: version = os.environ.get('JEDI_TEST_ENVIRONMENT', str(py_version)) - if int(version) == py_version: - return get_default_environment() - return get_system_environment(version[0] + '.' + version[1:]) diff --git a/jedi/evaluate/compiled/subprocess/__init__.py b/jedi/evaluate/compiled/subprocess/__init__.py index 9ebcd6ed..ed919d94 100644 --- a/jedi/evaluate/compiled/subprocess/__init__.py +++ b/jedi/evaluate/compiled/subprocess/__init__.py @@ -147,6 +147,7 @@ class CompiledSubprocess(object): @property @memoize_method def _process(self): + debug.dbg('Start environment subprocess %s', self._executable) parso_path = sys.modules['parso'].__file__ args = ( self._executable,