diff options
| author | JensDiemer <git@jensdiemer.de> | 2020-01-18 19:54:45 +0100 |
|---|---|---|
| committer | JensDiemer <git@jensdiemer.de> | 2020-01-18 20:10:57 +0100 |
| commit | 1d4de22dad62e642f3530927fbb3d261831e6927 (patch) | |
| tree | 020fe8f67a6adebcaae39d841936ac4ba624e1df | |
| parent | a2c47b4094940ba56a4a355cf389c4465bed1bff (diff) | |
| download | creole-1d4de22dad62e642f3530927fbb3d261831e6927.tar.gz | |
fix github actions adn Travis CI
| -rw-r--r-- | .coveragerc | 4 | ||||
| -rw-r--r-- | .github/workflows/pythonapp.yml | 29 | ||||
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 48 insertions, 11 deletions
diff --git a/.coveragerc b/.coveragerc index b7b7ca6..deb1a12 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,9 +1,11 @@ [run] branch = True source = creole +omit = + */tests/* + */site-packages/* [report] -omit = ../*migrations*,../*tests*,../*compat.* # Regexes for lines to exclude from consideration exclude_lines = # Have to re-enable the standard pragma diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 2480f8a..a244f20 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -19,10 +19,31 @@ jobs: make install - name: List installed packages - run: poetry run pip freeze + run: | + source $HOME/.poetry/env + poetry run pip freeze + + - name: List all tox test environments + run: | + source $HOME/.poetry/env + make tox-listenvs # - name: Run linters -# run: make lint +# run: | +# source $HOME/.poetry/env +# make lint - - name: Run pytest via tox - run: make tox + - name: Run tests with Python v3.8 + run: | + source $HOME/.poetry/env + make tox-py38 + + - name: Run tests with Python v3.7 + run: | + source $HOME/.poetry/env + make tox-py37 + + - name: Run tests with Python v3.6 + run: | + source $HOME/.poetry/env + make tox-py36 diff --git a/.travis.yml b/.travis.yml index 1b38fc6..c2d158e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,20 @@ language: python python: - - "3.6" - - "3.7" - "3.8" + - "3.7" + - "3.6" - "pypy3" install: + - make install-poetry + - source $HOME/.poetry/env - make install - poetry run pip freeze + - make tox-listenvs script: - - make test - - make lint + - make pytest after_success: - coveralls @@ -38,9 +38,21 @@ fix-code-style: ## Fix code formatting # poetry run isort --apply --recursive creole poetry run autopep8 --ignore-local-config --max-line-length=${MAX_LINE_LENGTH} --aggressive --aggressive --in-place --recursive creole -tox: check-poetry ## Run pytest via tox +tox-listenvs: check-poetry ## List all tox test environments + poetry run tox --listenvs + +tox: check-poetry ## Run pytest via tox with all environments poetry run tox +tox-py36: check-poetry ## Run pytest via tox with *python v3.6* + poetry run tox -e py36 + +tox-py37: check-poetry ## Run pytest via tox with *python v3.7* + poetry run tox -e py37 + +tox-py38: check-poetry ## Run pytest via tox with *python v3.8* + poetry run tox -e py38 + pytest: check-poetry ## Run pytest poetry run pytest @@ -11,5 +11,5 @@ whitelist_externals = make commands = make install make pytest - make lint +; make lint |