Repository navigation
Commit 39cd608
committed
Put back explicit venv activation in Alpine Linux
`busybox sh` does not appear to read commands from a file whose
path is given as the value of `$ENV`, in this situation. I think I
may have misunderstood that; the documentation does not say much
about it and maybe, in Almquist-style shells, it is only read by
interactive shells? I am not sure.
This removes everything about `ENV` and activates the venv in each
step where the venv should be used.
The good news is that the technique did work fully in Cygwin: not
only did `BASH_ENV` work (which was not much in doubt), but using
a virtual environment for all steps that run test code on Cygwin
fixed the problem and allowed all tests to pass. That seems to have
been the reason I didn't reproduce the problem locally: on my local
system I always use a venv in Cygwin since I would otherwise not
have adequate isolation.
Thus, this commit changes only the Alpine workflow and not the
Cygwin workflow.1 parent 4aad37a commit 39cd608
1 file changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,7 +17,7 @@ jobs: | |||
| 17 | 17 | - name: Prepare Alpine Linux | |
| 18 | 18 | run: | | |
| 19 | 19 | apk add sudo git git-daemon python3 py3-pip py3-virtualenv | |
| 20 | - echo 'Defaults env_keep += "CI ENV GITHUB_* RUNNER_*"' >/etc/sudoers.d/ci_env | ||
| 20 | + echo 'Defaults env_keep += "CI GITHUB_* RUNNER_*"' >/etc/sudoers.d/ci_env | ||
| 21 | 21 | addgroup -g 127 docker | |
| 22 | 22 | adduser -D -u 1001 runner # TODO: Check if this still works on GHA as intended. | |
| 23 | 23 | adduser runner docker | |
@@ -47,19 +47,21 @@ jobs: | |||
| 47 | 47 | - name: Set up virtualenv | |
| 48 | 48 | run: | | |
| 49 | 49 | python -m venv .venv | |
| 50 | - echo 'ENV=.venv/bin/activate' >> "$GITHUB_ENV" # ENV (not BASH_ENV) for BusyBox sh. | ||
| 51 | 50 | ||
| 52 | 51 | - name: Update PyPA packages | |
| 53 | 52 | run: | | |
| 54 | 53 | # Get the latest pip, wheel, and prior to Python 3.12, setuptools. | |
| 54 | + . .venv/bin/activate | ||
| 55 | 55 | python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel | |
| 56 | 56 | ||
| 57 | 57 | - name: Install project and test dependencies | |
| 58 | 58 | run: | | |
| 59 | + . .venv/bin/activate | ||
| 59 | 60 | pip install ".[test]" | |
| 60 | 61 | ||
| 61 | 62 | - name: Show version and platform information | |
| 62 | 63 | run: | | |
| 64 | + . .venv/bin/activate | ||
| 63 | 65 | uname -a | |
| 64 | 66 | command -v git python | |
| 65 | 67 | git version | |
@@ -68,4 +70,5 @@ jobs: | |||
| 68 | 70 | ||
| 69 | 71 | - name: Test with pytest | |
| 70 | 72 | run: | | |
| 73 | + . .venv/bin/activate | ||
| 71 | 74 | pytest --color=yes -p no:sugar --instafail -vv | |
0 commit comments