From a3339ac06248a995fb8c9d07dd7df4c6055b807a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 28 Nov 2022 16:49:56 -0600 Subject: [PATCH] Avoid `workon` command when deploying backup app --- rattail_fabric2/backup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rattail_fabric2/backup.py b/rattail_fabric2/backup.py index 4fedaf8..baf6aa8 100644 --- a/rattail_fabric2/backup.py +++ b/rattail_fabric2/backup.py @@ -103,7 +103,8 @@ def deploy_backup_app(c, deploy, envname, mkvirtualenv=True, user='rattail', # rattail if not exists(c, os.path.join(envpath, 'src/rattail')): c.sudo('git clone https://kallithea.rattailproject.org/rattail-project/rattail {}/src/rattail'.format(envpath), user=user) - c.sudo("bash -l -c 'workon {} && cdvirtualenv && bin/pip install --editable src/rattail'".format(envname), user=user) + c.sudo("bash -c 'PIP_CONFIG_FILE={0}/pip.conf {0}/bin/pip install --editable {0}/src/rattail'".format(envpath), + user=user) deploy_generic(c, 'backup/git-exclude', os.path.join(envpath, 'src/rattail/.git/info/exclude'), use_sudo=True, owner=user) # config @@ -156,7 +157,8 @@ def deploy_backup_app(c, deploy, envname, mkvirtualenv=True, user='rattail', packages.append('SQLAlchemy') if luigi_history_db.startswith('postgresql://'): packages.append('psycopg2') - c.sudo("bash -l -c 'workon {}; pip install {}'".format(envname, ' '.join(packages)), user=user) + c.sudo("bash -c 'PIP_CONFIG_FILE={0}/pip.conf {0}/bin/pip install {1}'".format(envpath, ' '.join(packages)), + user=user) # basic config mkdir(c, ['{}/app/luigitasks'.format(envpath),