Skip to content

Commit 5ef3633

Browse files
committed
Clean-up travis and tox file
1 parent db1798f commit 5ef3633

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

.travis.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
language: python
2+
23
sudo: required
4+
35
dist: xenial
6+
47
python:
58
- "3.4"
69
- "3.5"
710
- "3.6"
11+
- "3.7"
812

913
install:
10-
#- pip install tox
1114
- pip install tox-travis
1215

1316
script:
1417
- tox
15-
#- pytest --cov=pystiebeleleltron
16-
#- coverage run --source icon_font_to_png -m py.test
17-
#- coverage report -m
18-
19-
#after_success:
20-
#- coveralls
2118

2219
#deploy:
2320
# https://docs.travis-ci.com/user/deployment/pypi/

tox.ini

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@ deps =
1212
pytest
1313
twisted
1414
-rrequirements.txt
15-
commands =
16-
#pytest --cov=pystiebeleltron --cov-report html {posargs}
17-
pytest
18-
# --no-cov
1915
setenv =
2016
PYTHONWARINGS=all
17+
commands =
18+
pytest
2119

2220
[testenv:py36]
23-
passenv = TRAVIS TRAVIS_*
2421
deps =
2522
pytest
2623
pytest-cov
@@ -30,21 +27,27 @@ commands =
3027
pytest --cov=pystiebeleltron --cov-report term {posargs}
3128

3229
[testenv:pylint]
33-
deps = pylint
34-
commands = pylint --rcfile=tox.ini pystiebeleltron
30+
deps =
31+
pylint
32+
commands =
33+
pylint --rcfile=tox.ini pystiebeleltron
3534

3635
[testenv:flake8]
37-
deps = flake8
38-
commands = flake8 pystiebeleltron
36+
deps =
37+
flake8
38+
commands =
39+
flake8 pystiebeleltron
3940
#norecursedirs=.tox .git venv
4041
#ignore = E226
4142

4243
[flake8]
4344
exclude = .tox
4445

4546
[testenv:refactory]
46-
deps = pylint
47-
commands = pylint -d all -e CR pystiebeleltron
47+
deps =
48+
pylint
49+
commands =
50+
pylint -d all -e CR pystiebeleltron
4851

4952
[testenv:coverage]
5053
#deps = coverage
@@ -55,13 +58,15 @@ deps =
5558
coveralls
5659
commands =
5760
coverage report --rcfile=tox.ini --fail-under=65
58-
coveralls
59-
60-
[report]
61-
show_missing = True
61+
coveralls --rcfile=tox.ini
6262

63+
# for travis-ci configuration
6364
[travis]
6465
python =
6566
3.4: py34
6667
3.5: py35
67-
3.6: py36, flake8, pylint, coverage
68+
3.6: py36, flake8, pylint, coverage
69+
70+
# .coveragerc to control coverage.py
71+
[report]
72+
show_missing = True

0 commit comments

Comments
 (0)