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.

Sign up for GitHub

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

Jump to bottom

Switch to poetry #19

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Switch to poetry #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a0b3f9
Switch to poetry
BryceBeagle Aug 13, 2020
6b29bc6
Add missing poetry.lock files
BryceBeagle Aug 13, 2020
f88200a
Attempt to fix vcap and vcap_utils common package dependencies
BryceBeagle Aug 14, 2020
3b962d1
Attempt to Update CI
BryceBeagle Aug 14, 2020
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
47 changes: 15 additions & 32 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,48 +7,31 @@ on:
jobs:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like this job is still set up to run for every commit on master, but I think that would make this CI fail unless we always bump the vcap and vcap_utils versions for every commit since PyPI doesn't let you overwrite versions. Should it instead run only when there's a git tag?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poetry has a version command. So you can do poetry version minor and it bumps the version in the toml.
Is this something we could integrate into the CI?

deploy:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.6']


steps:
- uses: actions/checkout@v2
with:
# Include tags in the checkout
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Get Pip cache directory
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- uses: actions/cache@v1
id: cache
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-${{ hashFiles('**/setup.py') }}-pip-cache
restore-keys: |
${{ runner.os }}-pip-cache
- name: Install dependencies
run: |
pip install --upgrade setuptools wheel twine
python-version: 3.6

- name: Install poetry
uses: dschep/[email protected]

- name: Publish vcap
working-directory: ./vcap
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
PRE_RELEASE_SUFFIX=$(python3 ../.github/workflows/pre_release_suffix.py) \
python3 setup.py sdist bdist_wheel
python3 -m twine upload dist/*
POETRY_HTTP_BASIC_PYPI_USERNAME: __token__
POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: poetry publish
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you haven't already, would you mind testing this pipeline with Test PyPI to make sure all is well? To do that, you have to set these environment variables:

POETRY_REPOSITORIES_TESTPYPI_URL: https://test.pypi.org/legacy/
POETRY_HTTP_BASIC_TESTPYPI_USERNAME: __token__
POETRY_HTTP_BASIC_TESTPYPI_PASSWORD=${{ secrets.TEST_PYPI_PASSWORD }}

and then add --repository testpypi to the publish command. You'd also have to get rid of the rule saying this only runs on the master branch temporarily.


- name: Publish vcap-utils
working-directory: ./vcap_utils
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
PRE_RELEASE_SUFFIX=$(python3 ../.github/workflows/pre_release_suffix.py) \
python3 setup.py sdist bdist_wheel
python3 -m twine upload dist/*
POETRY_HTTP_BASIC_PYPI_USERNAME: __token__
POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: poetry publish
64 changes: 35 additions & 29 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,48 @@ jobs:
test:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6]

steps:
- uses: actions/checkout@v2
with:
# Include tags in the checkout
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Get Pip cache directory
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- uses: actions/cache@v1
id: cache
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-${{ hashFiles('**/setup.py') }}-pip-cache
restore-keys: |
${{ runner.os }}-pip-cache
- uses: actions/checkout@v2
with:
# Include tags in the checkout
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.6

- name: Install poetry
uses: dschep/[email protected]

- name: Configure poetry for caching
run: |
# https://github.com/dschep/install-poetry-action/issues/11
poetry config virtualenvs.create true
poetry config virtualenvs.in-project false
poetry config cache-dir ~/.poetry
poetry config virtualenvs.path ~/.poetry/virtualenv

- name: Cache poetry virtualenv
uses: actions/cache@v2
id: poetry-cache
with:
path: ~/.poetry
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
restore-keys: |
${{ runner.os }}-poetry-

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
pip install -e "./vcap[easy,tests]"
pip install -e "./vcap_utils[tests]"
working-directory: ./vcap_utils
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This grabs the PyPI version of vcap. Undesirable, but now sure how to proceed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it work to run something like poetry install ../vcap?

run: poetry install -E easy

- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=79 --statistics

- name: Test with pytest
run: |
pytest
run: pytest
Loading