Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct Python version in Poetry init #179

Merged
merged 3 commits into from
Mar 11, 2024
Merged

Use correct Python version in Poetry init #179

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8833184
Use correct Python version in Poetry init
Jan 5, 2024
4ce3fed
Use interpreter override if configured
Feb 21, 2024
f0b083d
Don't use agent.python_binary if it is empty
Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clearml_agent/commands/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3569,8 +3569,8 @@ def install_virtualenv(
executable_version, executable_version_suffix, executable_name = \
self.find_python_executable_for_version(def_python_version)

self._session.config.put("agent.default_python", executable_version_suffix)
self._session.config.put("agent.python_binary", executable_name)
self._session.config.put("agent.default_python", executable_version_suffix)
self._session.config.put("agent.python_binary", executable_name)

venv_dir = Path(venv_dir) if venv_dir else \
Path(self._session.config["agent.venvs_dir"], executable_version_suffix)
Expand Down
9 changes: 7 additions & 2 deletions clearml_agent/helper/package/poetry_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ def new_func(self, *args, **kwargs):

class PoetryConfig:

def __init__(self, session, interpreter=None):
def __init__(self, session):
# type: (Session, str) -> None
self.session = session
self._log = session.get_logger(__name__)
self._python = interpreter or sys.executable
self._python = sys.executable # default, overwritten from session config in initialize()
self._initialized = False

@property
Expand Down Expand Up @@ -88,6 +88,11 @@ def _config(self, *args, **kwargs):
@_guard_enabled
def initialize(self, cwd=None):
if not self._initialized:
# use correct python version -- detected in Worker.install_virtualenv() and written to
# session
if self.session.config.get("agent.python_binary", None) is not None:
nfzd marked this conversation as resolved.
Show resolved Hide resolved
self._python = self.session.config.get("agent.python_binary")

if self.session.config.get("agent.package_manager.poetry_version", None) is not None:
version = str(self.session.config.get("agent.package_manager.poetry_version"))

Expand Down