diff --git a/clearml_session/__main__.py b/clearml_session/__main__.py index ca08722..53751ea 100644 --- a/clearml_session/__main__.py +++ b/clearml_session/__main__.py @@ -14,18 +14,7 @@ from time import time, sleep if sys.platform == 'win32': import msvcrt # noqa - import wexpect as pexpect # noqa - - if sys.prefix != sys.base_prefix: - # running in venv - from clearml.utilities.version import Version - if Version(pexpect.__version__) < Version("4.0.1"): - # Wexpect issue https://github.com/raczben/wexpect/issues/26#issuecomment-1574339194 - try: - import wexpect_venv as pexpect - except ImportError: - print("WARNING: wexpect_venv is required to connect via SSH when running in a Windows virtualenv." - " Please install using 'pip install wexpect_venv' in this virtual environment") + import wexpect_venv as pexpect else: import select # noqa import pexpect # noqa diff --git a/requirements.txt b/requirements.txt index 1fd87bb..071b61e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ clearml >= 1.1.5 pexpect ; sys_platform != 'win32' -wexpect ; sys_platform == 'win32' +wexpect_venv ; sys_platform == 'win32' pillow>=10.0.1 # not directly required, pinned by Snyk to avoid a vulnerability