From c3503672d57153a65638f332a836b9e74a5414eb Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 12 Jan 2020 20:51:40 +0100 Subject: [PATCH] Implement interpreter test on travis --- .travis.yml | 1 + conftest.py | 6 +++--- tox.ini | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b1b70a0..8e7d3286 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - JEDI_TEST_ENVIRONMENT=36 - JEDI_TEST_ENVIRONMENT=37 - JEDI_TEST_ENVIRONMENT=38 + - JEDI_TEST_ENVIRONMENT=interpreter matrix: include: diff --git a/conftest.py b/conftest.py index 47d98b90..37fcf179 100644 --- a/conftest.py +++ b/conftest.py @@ -90,13 +90,13 @@ def clean_jedi_cache(request): @pytest.fixture(scope='session') def environment(request): - if request.config.option.interpreter_env: - return InterpreterEnvironment() - version = request.config.option.env if version is None: version = os.environ.get('JEDI_TEST_ENVIRONMENT', str(py_version)) + if request.config.option.interpreter_env or version == 'interpreter': + return InterpreterEnvironment() + return get_system_environment(version[0] + '.' + version[1:]) diff --git a/tox.ini b/tox.ini index ef5eaa33..d990d712 100644 --- a/tox.ini +++ b/tox.ini @@ -27,6 +27,7 @@ setenv = env35: JEDI_TEST_ENVIRONMENT=35 env36: JEDI_TEST_ENVIRONMENT=36 env37: JEDI_TEST_ENVIRONMENT=37 + interpreter: JEDI_TEST_ENVIRONMENT=interpreter commands = pytest {posargs} [testenv:cov-py37]