Skip to content

Commit

Permalink
Merge c775c15 into ff6cf9a
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomcteixeira committed Jan 21, 2021
2 parents ff6cf9a + c775c15 commit fe36ab5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 33 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source =
*/site-packages

[run]
relative_files = true
branch = true
source =
sampleproject
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.platform }}
strategy:
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
Expand All @@ -37,15 +37,20 @@ jobs:
# PLATFORM: ${{ matrix.platform }}

# from https://github.com/hynek/structlog/blob/master/.github/workflows/main.yml
- name: "Combine coverage"
run: |
set -xe
python -m coverage combine
python -m coverage xml
if: "contains(env.USING_COVERAGE, matrix.python-version)"
#- name: Combine coverage
# run: |
# set -xe
# python -m coverage combine
# python -m coverage xml
# #if: "contains(env.USING_COVERAGE, matrix.python-version)"

- name: Upload coverage to Codecov
if: "contains(env.USING_COVERAGE, matrix.python-version)"
#if: "contains(env.USING_COVERAGE, matrix.python-version)"
uses: "codecov/codecov-action@v1"
with:
fail_ci_if_error: true

- name: Upload coverage to COVERALLS
uses: AndreMiras/coveralls-python-action@develop
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ I intent to keep this repository up to date to my knowledge and needs. Your feed

.. start-badges
.. image:: https://github.com/joaomcteixeira/sampleproject/workflows/CI/badge.svg?branch=master
:target: https://github.com/hynek/structlog/actions?workflow=CI
.. image:: https://github.com/joaomcteixeira/python-project-skeleton/workflows/CI/badge.svg?branch=master
:target: https://github.com/joaomcteixeira/python-project-skeleton/actions?workflow=CI
:alt: CI Status

.. image:: https://codecov.io/gh/joaomcteixeira/python-project-skeleton/branch/master/graph/badge.svg
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def read(*names, **kwargs):
)

setup(
name='sampleproject',
name='jmct-sampleproject',
version='0.2.1',
description='A skeleton template for Python projects.',
long_description=long_description,
Expand Down
47 changes: 25 additions & 22 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
[tox]
minversion = 3.14.0
ignore_basepython_conflict = true
envlist =
check
radon
docs
py36
py37
py38
#coverage-report

[gh-actions]
python =
3.6: py36
3.7: py37, docs, radon, safety, codecov, coveralls
3.7: py37, docs, radon, safety
3.8: py38

# not yet tested
Expand All @@ -21,15 +23,13 @@ python =
# macos-latest: macos
# windows-latest: windows

#report
ignore_basepython_conflict = true

[testenv]
basepython =
{py36}: {env:TOXPYTHON:python3.6}
{py37,docs}: {env:TOXPYTHON:python3.7}
{py38}: {env:TOXPYTHON:python3.8}
{check,radon,safety,codecov,coveralls}: {env:TOXPYTHON:python3}
{check,radon,safety}: {env:TOXPYTHON:python3}
passenv = *
#deps = -r{toxinidir}/cirequirements.txt

Expand Down Expand Up @@ -116,27 +116,30 @@ skip_install = true
commands = safety check

# codecov report
[testenv:codecov]
depends = report
deps =
codecov
skip_install = true
commands =
codecov []

# coveralls report
[testenv:coveralls]
depends = report
deps =
coveralls
skip_install = true
commands =
coveralls []
#[testenv:codecov]
#depends = report
#deps =
# codecov
#skip_install = true
#commands =
# codecov []
#
## coveralls report
#[testenv:coveralls]
#depends = report
#deps =
# coveralls
#skip_install = true
#commands =
# coveralls []

#[testenv:report]
#deps = coverage
#[testenv:coverage-report]
#basepython = python3.8
#deps = coverage[toml]
#skip_install = true
#depends = py36,py37,py38
#commands =
# coverage combine
# coverage report
# coverage html

Expand Down

0 comments on commit fe36ab5

Please sign in to comment.