Skip to content

Commit

Permalink
Merge pull request #12 from mochipon/fix/cosmetic_cicd
Browse files Browse the repository at this point in the history
CI/CD Fixes
  • Loading branch information
mochipon committed Jun 14, 2021
2 parents 1210d13 + 51fede3 commit e1a871a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 41 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry tox tox-gh-actions
poetry install -E doc
- name: test with tox
run:
tox

- name: list files
run: ls -l .

- uses: codecov/codecov-action@v1
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml
pip install poetry
- name: Build wheels and source tarball
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
python-versions: [3.8]
python-versions: [3.9]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -48,8 +48,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox-gh-actions poetry
poetry install -E doc
pip install poetry
- name: Build wheels and source tarball
run: >-
Expand Down
36 changes: 13 additions & 23 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,40 +1,30 @@
[tox]
isolated_build = true
envlist = py37, py38, py39, lint, format
envlist = py37, py38, py39, lint

[gh-actions]
python =
3.9: py39
3.9: py39, lint
3.8: py38
3.7: py37

[testenv:lint]
whitelist_externals =
isort
black
flake8
poetry
mkdocs
twine
extras =
test
doc
dev
whitelist_externals = poetry
commands =
isort pysesame3
black pysesame3 tests
flake8 pysesame3 tests
poetry build
mkdocs build
twine check dist/*
poetry install -E doc
poetry run isort pysesame3
poetry run black pysesame3 tests
poetry run flake8 pysesame3 tests
poetry run poetry build
poetry run mkdocs build
poetry run twine check dist/*

[testenv]
whitelist_externals = pytest
extras =
test
whitelist_externals = poetry
passenv = *
setenv =
PYTHONPATH = {toxinidir}
PYTHONWARNINGS = ignore
commands =
pytest -s --cov=pysesame3 --cov-append --cov-report=xml --cov-report term-missing tests
poetry install
poetry run pytest -s --cov=pysesame3 --cov-append --cov-report=xml --cov-report term-missing tests

0 comments on commit e1a871a

Please sign in to comment.