Skip to content

Commit

Permalink
install extras in container
Browse files Browse the repository at this point in the history
  • Loading branch information
grizz committed Aug 29, 2023
1 parent a55f0f0 commit 5134e59
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install virtualenv from poetry
uses: 20c/workflows/poetry@v1
- name: Run linters
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install requirements
run: sudo apt-get install rrdtool librrd-dev fping traceroute
- name: Install virtualenv from poetry
Expand All @@ -49,6 +49,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: run tests against tester
run: ./Ctl/ci/run.sh vaping pytest -vv tests/
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ COPY src src
# Need to upgrade pip and wheel within Poetry for all its installs
RUN poetry run pip install --upgrade pip wheel
# poetry installs a pth for root
RUN poetry install --no-dev --no-root
RUN poetry build -f wheel
RUN pip install "$(ls dist/vaping-*.whl)[all]"
RUN pip install "$(ls dist/vaping-*.whl)[${vaping_extras}]"

# TODO testing stage in container for package deps, etc

Expand Down Expand Up @@ -94,7 +93,7 @@ RUN env
# install dev
RUN apk --update add $build_packages
RUN pip install "poetry$poetry_pin"
RUN poetry install --no-root
RUN poetry install --no-root --extras ${vaping_extras}


# execute from final image
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![PyPI](https://img.shields.io/pypi/v/vaping.svg?maxAge=60)](https://pypi.python.org/pypi/vaping)
[![PyPI](https://img.shields.io/pypi/pyversions/vaping.svg?maxAge=600)](https://pypi.python.org/pypi/vaping)
[![Tests](https://github.com/20c/vaping/workflows/tests/badge.svg)](https://github.com/20c/vaping)
[![LGTM Grade](https://img.shields.io/lgtm/grade/python/github/20c/vaping)](https://lgtm.com/projects/g/20c/vaping/alerts/)
[![CodeQL](https://github.com/20c/vaping/actions/workflows/codeql.yml/badge.svg)](https://github.com/20c/vaping/actions/workflows/codeql.yml)
[![Codecov](https://img.shields.io/codecov/c/github/20c/vaping/master.svg)](https://codecov.io/github/20c/vaping)


Expand Down

0 comments on commit 5134e59

Please sign in to comment.