Skip to content

Commit a3739af

Browse files
authored
get rid of tox on travis side - do not waste time (#20)
* get rid of tox on travis side - do not waste time
1 parent 56c2169 commit a3739af

File tree

3 files changed

+53
-43
lines changed

3 files changed

+53
-43
lines changed

.travis.yml

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,31 @@ language: python
33
os: linux
44
install:
55
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
6-
- pip install tox-travis
7-
- pip install coveralls
8-
script: []
6+
- &install_test_deps pip install --upgrade pytest pytest-sugar
7+
- &install_deps pip install -r CI_REQUIREMENTS.txt
8+
- pip install --upgrade pytest-cov coveralls
9+
10+
_helpers:
11+
- &install_cython pip install --upgrade Cython
12+
- &build_package python setup.py bdist_wheel
13+
- &install_built pip install advanced_descriptors --no-index -f dist
14+
- &test_no_cov py.test -vv test
15+
- &test_cythonized
16+
install:
17+
- *upgrade_python_toolset
18+
- *install_test_deps
19+
- *install_deps
20+
- *install_cython
21+
script:
22+
- *build_package
23+
- *install_built
24+
- *test_no_cov
25+
after_success: skip
26+
27+
script:
28+
- pip install -e .
29+
- py.test -vv --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
30+
- coverage report -m --fail-under 89
931
after_success:
1032
- coveralls
1133

@@ -15,60 +37,47 @@ jobs:
1537
- stage: test
1638
name: "Python 2.7"
1739
python: 2.7
18-
script:
19-
- tox -e py34
2040
- stage: test
2141
name: "Python 3.4"
2242
python: 3.4
23-
script:
24-
- tox -e py34
2543
- stage: test
2644
name: "Python 3.5"
2745
python: 3.5
28-
script:
29-
- tox -e py35
3046
- stage: test
3147
name: "Python 3.6"
3248
python: 3.6
33-
script:
34-
- tox -e py36
3549
- stage: test
3650
name: "Python 3.7"
3751
python: 3.7
3852
dist: xenial
3953
sudo: true
40-
script:
41-
- tox -e py37
4254
- stage: test
4355
name: "PyPy"
4456
python: pypy
45-
script:
46-
- tox -e pypy
4757
- stage: test
4858
name: "PyPy3"
4959
python: pypy3.5
50-
script:
51-
- tox -e pypy3
5260

5361
- stage: Static analisys
5462
name: "PyLint"
5563
python: 3.6
5664
services: []
5765
install:
5866
- *upgrade_python_toolset
59-
- pip install tox
67+
- *install_deps
68+
- pip install --upgrade "pylint < 2.0"
6069
script:
61-
- tox -e pylint
70+
- pylint advanced_descriptors
6271
after_success: skip
6372
- stage: Static analisys
6473
name: "Bandit"
6574
python: 3.6
6675
services: []
6776
install:
6877
- *upgrade_python_toolset
69-
- pip install tox
78+
- pip install --upgrade bandit
7079
script:
71-
- tox -e bandit
80+
- bandit -r advanced_descriptors
7281
after_success: skip
7382
- stage: Static analisys
7483
name: "MyPy"
@@ -78,55 +87,48 @@ jobs:
7887
services: []
7988
install:
8089
- *upgrade_python_toolset
81-
- pip install tox
90+
- *install_deps
91+
- pip install --upgrade "mypy >= 0.620"
8292
script:
83-
- tox -e mypy
93+
- mypy --strict advanced_descriptors
8494
after_success: skip
8595

8696
- stage: Test cythonized
8797
name: "Python 3.4"
8898
python: 3.4
89-
script:
90-
- tox -e py34-nocov
91-
after_success: skip
99+
<<: *test_cythonized
92100
- stage: Test cythonized
93101
name: "Python 3.5"
94102
python: 3.5
95-
script:
96-
- tox -e py35-nocov
97-
after_success: skip
103+
<<: *test_cythonized
98104
- stage: Test cythonized
99105
name: "Python 3.6"
100106
python: 3.6
101-
script:
102-
- tox -e py36-nocov
103-
after_success: skip
107+
<<: *test_cythonized
104108
- stage: Test cythonized
105109
name: "Python 3.7"
106110
python: 3.7
107111
dist: xenial
108112
sudo: true
109-
script:
110-
- tox -e py37-nocov
111-
after_success: skip
113+
<<: *test_cythonized
112114

113115
- stage: Code style check
114116
name: "PEP8"
115117
python: 3.6
116118
install:
117119
- *upgrade_python_toolset
118-
- pip install tox
120+
- pip install --upgrade flake8
119121
script:
120-
- tox -e pep8
122+
- flake8
121123
after_success: skip
122124
- stage: Code style check
123125
name: "PEP257"
124126
python: 3.6
125127
install:
126128
- *upgrade_python_toolset
127-
- pip install tox
129+
- pip install --upgrade pydocstyle
128130
script:
129-
- tox -e pep257
131+
- pydocstyle advanced_descriptors
130132
after_success: skip
131133

132134
- stage: deploy
@@ -139,10 +141,10 @@ jobs:
139141
install:
140142
- *upgrade_python_toolset
141143
script:
142-
- ./tools/run_docker.sh "Advanced_Descriptors"
144+
- ./tools/run_docker.sh "advanced_descriptors"
143145
before_deploy:
144146
- pip install -r build_requirements.txt
145-
- python setup.py bdist_wheel
147+
- *build_package
146148
deploy:
147149
- provider: pypi
148150
# `skip_cleanup: true` is required to preserve binary wheels, built

setup.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@ exclude =
3838
__init__.py,
3939
docs
4040
ignore =
41+
show-pep8 = True
4142
show-source = True
4243
count = True
44+
max-line-length = 120
45+
46+
[pydocstyle]
47+
ignore = D401, D203, D213
4348

4449
[aliases]
4550
test=pytest

tox.ini

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ commands = flake8
7676

7777
[testenv:pep257]
7878
deps =
79-
pep257
79+
pydocstyle
8080
usedevelop = False
81-
commands = pep257 advanced_descriptors
81+
commands = pydocstyle advanced_descriptors
8282

8383
[testenv:install]
8484
deps =
@@ -109,6 +109,9 @@ show-source = True
109109
count = True
110110
max-line-length = 120
111111

112+
[pydocstyle]
113+
ignore = D401, D203, D213
114+
112115
[testenv:docs]
113116
deps =
114117
sphinx

0 commit comments

Comments
 (0)