Skip to content

Commit 6832c09

Browse files
authored
wkcuber: use venv by default (except for Dockerfile & win build) (#410)
* wkcuber: use venv by default (except for Dockerfile) * no venv for windows CI, use poetry config cmd * add poetry.toml to gitignore, upgrade pip in windows CI * fix win CI * Update Dockerfile
1 parent a186213 commit 6832c09

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,13 @@ jobs:
9797
if: ${{ needs.changes.outputs.wkcuber == 'true' }}
9898

9999
- name: Check typing
100-
run: |
101-
./typecheck.sh
100+
run: poetry run ./typecheck.sh
102101

103102
- name: Python tests
104103
run: poetry run pytest tests
105104

106105
- name: CLI tests
107-
run: tests/scripts/all_tests.sh
106+
run: poetry run tests/scripts/all_tests.sh
108107

109108
- name: Check if git is dirty
110109
run: |
@@ -133,6 +132,7 @@ jobs:
133132
shell: bash
134133
run: |
135134
pip install poetry
135+
poetry config virtualenvs.create false --local
136136
poetry install
137137
138138
- name: Decompress test data
@@ -176,7 +176,7 @@ jobs:
176176
run: poetry run pytest tests
177177

178178
- name: CLI tests
179-
run: tests/scripts/all_tests.sh
179+
run: poetry run tests/scripts/all_tests.sh
180180

181181
wkcuber_docker:
182182
needs: [webknossos_linux, wkcuber_linux, wkcuber_win, wkcuber_mac]

wkcuber/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,6 @@ testdata/tiff_mag_2_reference
105105
.vscode/
106106

107107
# MyPy
108-
.mypy_cache/
108+
.mypy_cache/
109+
110+
/poetry.toml

wkcuber/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ RUN mkdir /app
44
WORKDIR /app
55

66
COPY wkcuber/README.md /app
7-
COPY wkcuber/poetry.toml /app
87
COPY wkcuber/poetry.lock /app
98
COPY wkcuber/pyproject.toml /app
109

@@ -19,6 +18,7 @@ COPY webknossos/poetry.lock /webknossos/
1918
COPY webknossos/pyproject.toml /webknossos/
2019
COPY webknossos/README.md /webknossos/
2120

21+
RUN poetry config virtualenvs.create false --local
2222
RUN poetry install --no-dev
2323

2424
ENTRYPOINT [ "python", "-m" ]

wkcuber/poetry.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)