Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Improvement) Swap out pipenv and setuptools for poetry #142

Merged
merged 1 commit into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,21 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: pipx install poetry
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- run: pip install pipenv
- run: pipenv install --dev --python ${{ matrix.python }}
- run: pipenv run pip install django~=${{ matrix.django }}.0
- run: pipenv run pytest --cov
cache: poetry
- run: poetry install --only main,test
- run: poetry run pip install django~=${{ matrix.django }}.0 --disable-pip-version-check
- run: poetry run pytest --cov

lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- run: pip install pipenv
- run: pipenv run check
- run: pipx install poetry
- run: poetry install --only lint
- run: poetry run script/check
27 changes: 0 additions & 27 deletions .github/workflows/pipenv-install.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/pipenv-lock.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .github/workflows/release-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ jobs:
with:
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}

- run: |
echo '__version__ = "v${{ needs.build_changelog.outputs.next_version }}"' > worf/__init__.py
- run: pipx install poetry
- run: poetry version ${{ needs.build_changelog.outputs.next_version }}
- run: echo '__version__ = "${{ needs.build_changelog.outputs.next_version }}"' > worf/__init__.py

- uses: gundotio/release-builder/pull-request@v1
with:
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN apt-get update -y && \

WORKDIR /app

RUN pip3 install pipenv==2020.11.15
RUN pip3 install poetry

COPY Pipfile Pipfile
COPY Pipfile.lock Pipfile.lock
COPY setup.py setup.py
COPY poetry.lock poetry.lock
COPY pyproject.toml pyproject.toml
COPY README.md README.md
COPY worf/ worf/

RUN pipenv install --dev --deploy --python 3.10.9
RUN poetry install
7 changes: 0 additions & 7 deletions MANIFEST.in

This file was deleted.

35 changes: 0 additions & 35 deletions Pipfile

This file was deleted.

Loading