Skip to content

Commit

Permalink
Merge eb6deeb into c167291
Browse files Browse the repository at this point in the history
  • Loading branch information
pcmxgti committed Jun 28, 2021
2 parents c167291 + eb6deeb commit c2eae6d
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 6 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ jobs:
pip install tox tox-gh-actions
- name: Test with tox
run: tox
- name: Convert coverage to LCOV format
if: matrix.python-version == '3.8'
run: tox -e coverage
- name: Upload coverage in Parallel
if: matrix.python-version == '3.8'
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.os }}-${{ matrix.python-version }}
path-to-lcov: ${{ github.workspace }}/lcov.info
parallel: true

auth:
name: Authenticated Tests
needs: test
Expand All @@ -73,3 +85,19 @@ jobs:
MFA_RESPONSE: ${{ secrets.TOXTEST_MFA_RESPONSE }}
OKTA_AWS_APP_URL: ${{ secrets.TOXTEST_OKTA_AWS_APP_URL }}
ROLE_ARN: ${{ secrets.TOXTEST_ROLE_ARN }}
- name: Generate Coverage reports
run: |
tox -e coverage
- name: Upload Coverage for auth tests
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: ${{ github.workspace }}/lcov.info
flag-name: run-3.x-auth
parallel: true
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: ${{ github.workspace }}/lcov.info
parallel-finished: true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ coverage.xml
*.cover
.hypothesis/
.pytest_cache/
lcov.info

# Translations
*.mo
Expand Down Expand Up @@ -104,4 +105,4 @@ venv.bak/
# mypy
.mypy_cache/

.DS_Store
.DS_Store
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Generate temporary AWS credentials via Okta.
.. image:: https://img.shields.io/badge/OS-Mac%2C%20Windows%2C%20Linux-9cf
:target: https://github.com/dowjones/tokendito/

.. image:: https://coveralls.io/repos/github/dowjones/tokendito/badge.svg
:target: https://coveralls.io/github/dowjones/tokendito

|
|
Expand Down
4 changes: 3 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-r ./requirements.txt
black==20.8b1; python_version >= '3.6'
coveragepy-lcov; python_version >= '3.8'
docutils<0.16,>=0.10
flake8
flake8-black; python_version >= '3.6'
Expand All @@ -8,11 +9,12 @@ flake8-docstrings
flake8-import-order>=0.9
pep8-naming
pexpect>=4.6.0
pylint>=1.8.4
pydocstyle==3.0.0
pylint>=1.8.4
pyotp
pyroma
pytest
pytest-cov
pytest-env
pytest-mock
pytest-ordering
Expand Down
14 changes: 10 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
skipsdist = true
envlist = lint, py{27,35,36,37,38}, auth
envlist = lint, py{27,35,36,37,38}, auth, coverage

[testenv]
deps = -r requirements-dev.txt
commands =
py.test -v -rA -k 'unit' -s tests/
py.test -v -rA -k 'functional and not credentials' -s tests/
py.test --cov=tokendito --cov-append -v -rA -k 'unit' -s tests/
py.test --cov=tokendito --cov-append -v -rA -k 'functional and not credentials' -s tests/

[testenv:lint]
skip_install = true
Expand All @@ -18,7 +18,13 @@ commands =
skip_install = true
passenv = OKTA_* AWS_* ROLE_* MFA_*
commands =
py.test -v -rA -k 'functional and credentials' -s tests/ {posargs}
py.test --cov=tokendito --cov-append -v -rA -k 'functional and credentials' -s tests/ {posargs}

[testenv:coverage]
skip_install = true
commands =
coverage report
coveragepy-lcov --relative_path

[gh-actions]
python =
Expand Down

0 comments on commit c2eae6d

Please sign in to comment.