From 7c5299d186c7bad2f7515a40afea65ad4bfd6930 Mon Sep 17 00:00:00 2001 From: ronny abraham Date: Tue, 22 Apr 2025 16:52:07 +0300 Subject: [PATCH] updates --- modules/initialize.py | 4 ++++ modules/maintenance.py | 2 +- modules/utils.py | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/initialize.py b/modules/initialize.py index 5d34482..4e0129f 100644 --- a/modules/initialize.py +++ b/modules/initialize.py @@ -608,6 +608,10 @@ def _init_virtualenv(configuration, config, layout): configuration.addbranch('virtualenv') + # + # bin variable for where the virtualenvwrapper bin was installed + configuration.virtualenv.bin = None + configuration.virtualenv.bin = config['virtualenv'].get('bin') # # workon_home variable configuration.virtualenv.workon = config['virtualenv']['workon'] diff --git a/modules/maintenance.py b/modules/maintenance.py index 6eb300f..a00ead4 100644 --- a/modules/maintenance.py +++ b/modules/maintenance.py @@ -95,7 +95,7 @@ def edit(remote_path, host_string=None): if sys.platform == "darwin": editor = "mvim" else: - editor = "vim" + editor = "nvim" # if env.key_filename: # cmd_edit = "{editor} sftp://{user}@{host_string}/{remote_path}" \ diff --git a/modules/utils.py b/modules/utils.py index f19bc63..3319edc 100644 --- a/modules/utils.py +++ b/modules/utils.py @@ -357,7 +357,15 @@ def virtualenv_source(): uses python yield command """ - with prefix("source virtualenvwrapper.sh"): + configuration = env.config + venv_bin = configuration.virtualenv.bin + + if venv_bin: + venv_activate = f"source {venv_bin}/virtualenvwrapper.sh" + else: + venv_activate = "source virtualenvwrapper.sh" + + with prefix(venv_activate): yield