Skip to content

Commit

Permalink
wkcuber: use venv by default (except for Dockerfile & win build) (#410)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jstriebel authored Sep 7, 2021
1 parent a186213 commit 6832c09
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,13 @@ jobs:
if: ${{ needs.changes.outputs.wkcuber == 'true' }}

- name: Check typing
run: |
./typecheck.sh
run: poetry run ./typecheck.sh

- name: Python tests
run: poetry run pytest tests

- name: CLI tests
run: tests/scripts/all_tests.sh
run: poetry run tests/scripts/all_tests.sh

- name: Check if git is dirty
run: |
Expand Down Expand Up @@ -133,6 +132,7 @@ jobs:
shell: bash
run: |
pip install poetry
poetry config virtualenvs.create false --local
poetry install
- name: Decompress test data
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
run: poetry run pytest tests

- name: CLI tests
run: tests/scripts/all_tests.sh
run: poetry run tests/scripts/all_tests.sh

wkcuber_docker:
needs: [webknossos_linux, wkcuber_linux, wkcuber_win, wkcuber_mac]
Expand Down
4 changes: 3 additions & 1 deletion wkcuber/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,6 @@ testdata/tiff_mag_2_reference
.vscode/

# MyPy
.mypy_cache/
.mypy_cache/

/poetry.toml
2 changes: 1 addition & 1 deletion wkcuber/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN mkdir /app
WORKDIR /app

COPY wkcuber/README.md /app
COPY wkcuber/poetry.toml /app
COPY wkcuber/poetry.lock /app
COPY wkcuber/pyproject.toml /app

Expand All @@ -19,6 +18,7 @@ COPY webknossos/poetry.lock /webknossos/
COPY webknossos/pyproject.toml /webknossos/
COPY webknossos/README.md /webknossos/

RUN poetry config virtualenvs.create false --local
RUN poetry install --no-dev

ENTRYPOINT [ "python", "-m" ]
2 changes: 0 additions & 2 deletions wkcuber/poetry.toml

This file was deleted.

0 comments on commit 6832c09

Please sign in to comment.