Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
NorthIsUp committed Dec 25, 2020
1 parent 3fe38be commit e4a2447
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
lint:
name: "lint"
name: "Lint"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -32,7 +32,7 @@ jobs:
test:
name: "tests & coverage"
name: "Test"
runs-on: macos-latest
strategy:
matrix:
Expand Down
9 changes: 4 additions & 5 deletions run-tests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash

rootdir="$( cd "$( dirname "$0" )"; pwd )"

usage() {
Expand Down Expand Up @@ -57,6 +56,7 @@ while getopts ":c:hltvVx" opt; do
case $opt in
c)
coverpkg="$OPTARG"
PYTEST_ADDOPTS="$PYTEST_ADDOPTS --cov-report=html --cov="$coverpkg""
;;
l)
dolint=0
Expand Down Expand Up @@ -109,11 +109,10 @@ coverage erase

if [[ $dotest -eq 0 ]]; then
# More options are in tox.ini
set -x
export PYTEST_ADDOPTS="$PYTEST_ADDOPTS --cov-report=html"

export PYTEST_ADDOPTS
export PYTEST_RUNNING=1
python3 -m pytest $vopts --cov="$coverpkg" -vv tests "$@"
set +x
python3 -m pytest $vopts -vv tests "$@"
ret1=${PIPESTATUS[0]}
echo

Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[pytest]
addopts =
--verbose
--verbose --verbose
--capture=fd
; --cov-config=.coveragerc
--tb=long
--color=auto
--cov-report=""
--doctest-modules
; --cov-config=.coveragerc
; --cov-report=""

[tox]
envlist=py3.{6,7,8,9}
Expand Down

0 comments on commit e4a2447

Please sign in to comment.