From 597ed72454d5f72c95ea7f733ad545afe0960ee5 Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 19:59:59 +0000 Subject: [PATCH 1/6] check PIP_REQUIRE_VIRTUALENV --- .github/workflows/test_install.yml | 5 ++++- roles/pyenv/tasks/main.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 4b6f01a..0400f9c 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -42,5 +42,8 @@ jobs: alias git config --list python --version - clamscan --version + ! pip install jsonschema # should not work because no venv + + clamscan --versionecho + \ No newline at end of file diff --git a/roles/pyenv/tasks/main.yml b/roles/pyenv/tasks/main.yml index 96239ea..b0d6c31 100644 --- a/roles/pyenv/tasks/main.yml +++ b/roles/pyenv/tasks/main.yml @@ -27,6 +27,7 @@ path: '{{ user_profile }}' marker: '# {mark} ANSIBLE_PYENV' block: | + #export PIP_REQUIRE_VIRTUALENV=true export PATH="{{ user_home }}/.pyenv/shims:{{ user_home }}/.pyenv/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" From ed2c53ee10fd47644fedfcc07b43bc2453d492d4 Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 20:09:12 +0000 Subject: [PATCH 2/6] check PIP_REQUIRE_VIRTUALENV --- roles/pyenv/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pyenv/tasks/main.yml b/roles/pyenv/tasks/main.yml index b0d6c31..675198e 100644 --- a/roles/pyenv/tasks/main.yml +++ b/roles/pyenv/tasks/main.yml @@ -27,7 +27,7 @@ path: '{{ user_profile }}' marker: '# {mark} ANSIBLE_PYENV' block: | - #export PIP_REQUIRE_VIRTUALENV=true + export PIP_REQUIRE_VIRTUALENV=true export PATH="{{ user_home }}/.pyenv/shims:{{ user_home }}/.pyenv/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" From 6b37f8ae6ca1a98418bfe4222565034e0855fd94 Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 20:15:53 +0000 Subject: [PATCH 3/6] check PIP_REQUIRE_VIRTUALENV --- workstation.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/workstation.yml b/workstation.yml index 3fe0532..5fc0134 100644 --- a/workstation.yml +++ b/workstation.yml @@ -16,8 +16,6 @@ - role: ./roles/gcloud - role: ./roles/expressvpn - role: ./roles/pyenv - - role: ./roles/pipx - - role: ./roles/pipenv - role: ./roles/git - role: ./roles/clamav - role: ./roles/xfce From 98a6f877fec93bd8c89ad7390e9e923a20e85aa5 Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 20:25:46 +0000 Subject: [PATCH 4/6] check PIP_REQUIRE_VIRTUALENV --- .github/workflows/test_install.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 0400f9c..d0ed5bc 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -39,6 +39,7 @@ jobs: shell: bash -l {0} run: | su - tester + source ~/.profile alias git config --list python --version From ef0cda461e59bedf938aebdfdaa859ebee89307b Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 20:38:41 +0000 Subject: [PATCH 5/6] check PIP_REQUIRE_VIRTUALENV --- .github/workflows/test_install.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index d0ed5bc..0d85980 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -38,13 +38,9 @@ jobs: - name: check shell: bash -l {0} run: | - su - tester - source ~/.profile - alias - git config --list - python --version - ! pip install jsonschema # should not work because no venv - - clamscan --versionecho - + su - tester -c "alias" + su - tester -c "git config --list" + su - tester -c "python --version" + su - tester -c "! pip install jsonschema # should not work because no venv" + su - tester -c "clamscan --versionecho" \ No newline at end of file From 3e4b952bfac79c1cc8642d88b28aa066a9248c24 Mon Sep 17 00:00:00 2001 From: Paul Brabban Date: Tue, 1 Oct 2024 20:44:03 +0000 Subject: [PATCH 6/6] check PIP_REQUIRE_VIRTUALENV --- .github/workflows/test_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 0d85980..ca030e7 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -42,5 +42,5 @@ jobs: su - tester -c "git config --list" su - tester -c "python --version" su - tester -c "! pip install jsonschema # should not work because no venv" - su - tester -c "clamscan --versionecho" + su - tester -c "clamscan --version" \ No newline at end of file