Skip to content

Commit

Permalink
fix(build): fix optional poetry dependencies
Browse files Browse the repository at this point in the history
Optional pip dependencies were configured incorrectly and were always being installed. The dependencies have been reconfigured as optional and included in the expected "extras" groups.

Fixes #335
  • Loading branch information
kenibrewer committed Oct 28, 2023
1 parent 871b633 commit 542307d
Show file tree
Hide file tree
Showing 5 changed files with 700 additions and 665 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
poetry config virtualenvs.in-project true --local
poetry install --with cell_locations,collate,dev
poetry install --with dev --all-extras
poetry run pre-commit install --install-hooks
10 changes: 2 additions & 8 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,10 @@ jobs:
path: .venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
#----------------------------------------------
# install dependencies if cache does not exist
# install dependencies
#----------------------------------------------
- name: Install dependencies
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
#----------------------------------------------
# install your root project, if required
#----------------------------------------------
- name: Install library
run: poetry install --no-interaction
run: poetry install --no-interaction --all-extras --with dev
#----------------------------------------------
# run test suite and output coverage file
#----------------------------------------------
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,10 @@ jobs:
path: .venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
#----------------------------------------------
# install dependencies if cache does not exist
#----------------------------------------------
- name: Install dependencies
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root --all-extras --without docs
#----------------------------------------------
# install pycytominer
#----------------------------------------------
- name: Install library
run: poetry install --no-interaction --only-root
- name: Install dependencies
run: poetry install --no-interaction --all-extras --with dev
#----------------------------------------------
# run test suite and output coverage file
#----------------------------------------------
Expand Down
Loading

0 comments on commit 542307d

Please sign in to comment.