Skip to content

Commit

Permalink
Merge pull request #42 from jw/#41_Poetry
Browse files Browse the repository at this point in the history
#41 poetry
  • Loading branch information
jw authored Dec 27, 2019
2 parents 2cabdfe + 350f58a commit f0c957c
Show file tree
Hide file tree
Showing 180 changed files with 2,186 additions and 1,579 deletions.
55 changes: 18 additions & 37 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,48 @@ workflows:
- test-3.6
- test-3.7
- test-3.8
environment: &test-environment
PIPENV_IGNORE_VIRTUALENVS: 1
PYTHONPATH: stilus
PIPENV_VENV_IN_PROJECT: true
PIPENV_QUIET: true
jobs:
test-3.6:
docker:
- image: circleci/python:3.6
environment:
<<: *test-environment
steps:
- checkout
- run: sudo pip install --upgrade pip
- run: sudo pip install --upgrade pipenv
- run: pipenv --python 3.6 install --dev
- run: pipenv run flake8 --exclude=`pipenv --venv` ~/stilus
- run: pipenv run python setup.py test
- run: pipenv run coveralls
- run: pipenv run codecov

- run: sudo pip install --upgrade poetry
- run: poetry install -v
- run: poetry run flake8
- run: poetry run pytest --cov-report html --cov-report term --cov-report term-missing tests
- run: poetry run coveralls
- run: poetry run codecov
- store_test_results:
path: test-reports
- store_artifacts:
path: test-reports

test-3.7:
docker:
- image: circleci/python:3.7
environment:
<<: *test-environment
steps:
- checkout
- run: sudo pip install --upgrade pip
- run: sudo pip install --upgrade pipenv
- run: pipenv --python 3.7 install --dev
- run: pipenv run flake8 --exclude=`pipenv --venv` ~/stilus
- run: pipenv run python setup.py test
- run: pipenv run coveralls
- run: pipenv run codecov

- run: sudo pip install --upgrade poetry
- run: poetry install -v
- run: poetry run flake8
- run: poetry run pytest --cov-report html --cov-report term --cov-report term-missing tests
- run: poetry run coveralls
- run: poetry run codecov
- store_test_results:
path: test-reports
- store_artifacts:
path: test-reports

test-3.8:
docker:
- image: circleci/python:3.8
environment:
<<: *test-environment
steps:
- checkout
- run: sudo pip install --upgrade pip
- run: sudo pip install --upgrade pipenv
- run: pipenv --python 3.8 install --dev
- run: pipenv run flake8 --exclude=`pipenv --venv` ~/stilus
- run: pipenv run python setup.py test
- run: pipenv run coveralls
- run: pipenv run codecov

- run: sudo pip install --upgrade poetry
- run: poetry install -v
- run: poetry run flake8
- run: poetry run pytest --cov-report html --cov-report term --cov-report term-missing tests
- run: poetry run coveralls
- run: poetry run codecov
- store_test_results:
path: test-reports
- store_artifacts:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ stilus.egg-info/
coverage.xml
.coverage
htmlcov/
test-reports/

debug.log
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@ python:
- "3.7"
- "3.8"

env:
global:
- PIPENV_IGNORE_VIRTUALENVS=1
- PYTHONPATH=stilus
before_install:
- pip install poetry

install:
- pip install pipenv
- pipenv install --dev
- poetry install -v

script:
- pipenv run flake8
- pipenv run python setup.py test
- poetry run flake8
- poetry run pytest --cov-report html --cov-report term --cov-report term-missing tests

after_success:
- pipenv run coveralls
- pipenv run codecov
- poetry run coveralls
- poetry run codecov
1 change: 0 additions & 1 deletion MANIFEST.in

This file was deleted.

3 changes: 0 additions & 3 deletions Makefile

This file was deleted.

31 changes: 0 additions & 31 deletions Pipfile

This file was deleted.

Loading

0 comments on commit f0c957c

Please sign in to comment.