Commit 9306cd25 by finswimmer Committed by GitHub

fix(utils.env): import cli_run from virtualenv (#2096)

* fix(utils.env): import cli_run from virtualenv if create_environment import failes

* fix (utils.env): added accidentally removed code
parent 15728eed
...@@ -108,14 +108,19 @@ try: ...@@ -108,14 +108,19 @@ try:
from venv import EnvBuilder from venv import EnvBuilder
builder = EnvBuilder(with_pip=True) builder = EnvBuilder(with_pip=True)
build = builder.create builder.create(path)
except ImportError: except ImportError:
try:
# We fallback on virtualenv for Python 2.7 # We fallback on virtualenv for Python 2.7
from virtualenv import create_environment from virtualenv import create_environment
build = create_environment create_environment(path)
except ImportError:
# since virtualenv>20 we have to use cli_run
from virtualenv import cli_run
build(path)""" cli_run([path])
"""
class EnvError(Exception): class EnvError(Exception):
...@@ -668,14 +673,18 @@ class EnvManager(object): ...@@ -668,14 +673,18 @@ class EnvManager(object):
use_symlinks = True use_symlinks = True
builder = EnvBuilder(with_pip=True, symlinks=use_symlinks) builder = EnvBuilder(with_pip=True, symlinks=use_symlinks)
build = builder.create builder.create(path)
except ImportError: except ImportError:
try:
# We fallback on virtualenv for Python 2.7 # We fallback on virtualenv for Python 2.7
from virtualenv import create_environment from virtualenv import create_environment
build = create_environment create_environment(path)
except ImportError:
# since virtualenv>20 we have to use cli_run
from virtualenv import cli_run
build(path) cli_run([path])
def remove_venv(self, path): # type: (str) -> None def remove_venv(self, path): # type: (str) -> None
shutil.rmtree(path) shutil.rmtree(path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment