From a752bb761fed86afc4218bee135cd5c4a0200418 Mon Sep 17 00:00:00 2001 From: drorganvidez Date: Thu, 2 Jan 2025 21:24:56 +0100 Subject: [PATCH] fix: Change venv to vagrant_venv --- .gitignore | 1 + vagrant/04_install_dependencies.yml | 12 +++--------- vagrant/05_run_app.yml | 4 ++-- vagrant/06_utilities.yml | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 71b757e79..cfe410175 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ build/ htmlcov/ .pytest_cache venv/ +vagrant_venv/ ubuntu-bionic-18.04-cloudimg-console.log .vagrant/ nginx.prod.ssl.conf diff --git a/vagrant/04_install_dependencies.yml b/vagrant/04_install_dependencies.yml index 36e55ab56..aa210148b 100755 --- a/vagrant/04_install_dependencies.yml +++ b/vagrant/04_install_dependencies.yml @@ -29,20 +29,14 @@ args: executable: /bin/bash - - name: Remove existing virtual environment if it exists - file: - path: "{{ working_dir }}/venv" - state: absent - force: yes - - name: Set up the Python 3.12 virtual environment - command: python3.12 -m venv {{ working_dir }}/venv + command: python3.12 -m venv {{ working_dir }}/vagrant_venv args: - creates: "{{ working_dir }}/venv/bin/activate" + creates: "{{ working_dir }}/vagrant_venv/bin/activate" - name: Activate the virtual environment and install dependencies shell: | - source {{ working_dir }}/venv/bin/activate + source {{ working_dir }}/vagrant_venv/bin/activate pip install --upgrade pip cd {{ working_dir }} pip install -r requirements.txt diff --git a/vagrant/05_run_app.yml b/vagrant/05_run_app.yml index 51346f1ee..bb5e33003 100755 --- a/vagrant/05_run_app.yml +++ b/vagrant/05_run_app.yml @@ -26,7 +26,7 @@ - name: Set database with Rosemary shell: | - source {{ working_dir }}venv/bin/activate + source {{ working_dir }}vagrant_venv/bin/activate cd {{ working_dir }} flask db upgrade rosemary db:seed -y --reset @@ -36,7 +36,7 @@ - name: Run Flask application shell: | - source {{ working_dir }}venv/bin/activate + source {{ working_dir }}vagrant_venv/bin/activate cd {{ working_dir }} nohup flask run --host=0.0.0.0 --port=5000 --reload --debug > app.log 2>&1 & args: diff --git a/vagrant/06_utilities.yml b/vagrant/06_utilities.yml index c5cc9540c..c25dcfb5d 100755 --- a/vagrant/06_utilities.yml +++ b/vagrant/06_utilities.yml @@ -10,6 +10,6 @@ line: '{{ item }}' create: yes with_items: - - 'source {{ working_dir }}venv/bin/activate' + - 'source {{ working_dir }}vagrant_venv/bin/activate' - 'cd {{ working_dir }}' when: ansible_user == 'vagrant'