Skip to content

Commit b7e3baa

Browse files
committed
usedevelop = False & direct setup.py develop for tests
1 parent d1a1554 commit b7e3baa

File tree

5 files changed

+62
-77
lines changed

5 files changed

+62
-77
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _helpers:
4646
after_success: skip
4747

4848
script:
49-
- pip install -e .
49+
- python setup.py develop -v
5050
- py.test -vv --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
5151
- coverage report -m --fail-under 89
5252
after_success:

MANIFEST.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
include *.rst LICENSE requirements.txt
1+
include *.rst LICENSE requirements.txt pyproject.toml
22
global-exclude *.c
33
exclude Makefile
44
prune tools
5-
exclude .travis.yml appveyor.yml
6-
exclude tox.ini pytest.ini .coveragerc
5+
exclude .travis.yml appveyor.yml azure-pipelines.yml .pyup.yml
6+
exclude tox.ini pytest.ini .coveragerc .pylintrc
7+
exclude .gitignore .dockerignore
78
prune test
89
prune .github
9-
exclude CODEOWNERS CODE_OF_CONDUCT.md
10+
prune .azure_pipelines
11+
prune docs
12+
exclude CODEOWNERS CODE_OF_CONDUCT.md _config.yml

README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ Basic API is conform with `property`, but in addition it is possible to customiz
138138

139139
Usage examples:
140140

141-
1. Simple usage. All by default, logger is re-used from instance if available with names `logger` or `log` else used internal `advanced_descriptors.log_on_access` logger:
141+
1. Simple usage.
142+
All by default.
143+
logger is re-used from instance if available with names `logger` or `log` else used internal `advanced_descriptors.log_on_access` logger:
142144

143145
.. code-block:: python
144146

setup.cfg

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,17 @@ max-line-length = 120
4747

4848
[pydocstyle]
4949
ignore =
50+
# First line should be in imperative mood; try rephrasing
5051
D401,
52+
# No blank lines allowed after function docstring
5153
D202,
54+
# 1 blank line required before class docstring
5255
D203,
56+
# Multi-line docstring summary should start at the second line
5357
D213
54-
# First line should be in imperative mood; try rephrasing
55-
# No blank lines allowed after function docstring
56-
# 1 blank line required before class docstring
57-
# Multi-line docstring summary should start at the second line
58+
59+
[doc8]
60+
max-line-length = 150
5861

5962
[aliases]
6063
test = pytest

tox.ini

Lines changed: 44 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -11,103 +11,81 @@ skip_missing_interpreters = True
1111

1212
[testenv]
1313
recreate = True
14-
usedevelop = True
14+
usedevelop = False
1515
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
1616
setev = PYTHONDONTWRITEBYTECODE=1
1717
deps =
18-
sphinx
19-
pytest
20-
pytest-cov
21-
pytest-html
22-
pytest-sugar
23-
py{36,37}-nocov: Cython
24-
-r{toxinidir}/CI_REQUIREMENTS.txt
18+
sphinx
19+
pytest
20+
pytest-cov
21+
pytest-html
22+
pytest-sugar
23+
py3{6,7,8}-nocov: Cython
24+
-r{toxinidir}/CI_REQUIREMENTS.txt
2525

2626
commands =
27-
py.test -vv --junitxml=unit_result.xml --html=report.html --self-contained-html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
28-
coverage report --fail-under 89
27+
pip freeze
28+
python setup.py develop -v
29+
py.test -vv --junitxml=unit_result.xml --html=report.html --self-contained-html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
30+
coverage report --fail-under 89
2931

3032
[testenv:py36-nocov]
31-
usedevelop = False
3233
commands =
33-
python setup.py bdist_wheel
34-
pip install advanced_descriptors --no-index -f dist
35-
py.test -vv {posargs:test}
34+
python setup.py bdist_wheel
35+
pip install advanced_descriptors --no-index -f dist
36+
py.test -vv {posargs:test}
3637

3738
[testenv:py37-nocov]
38-
usedevelop = False
3939
commands =
40-
python setup.py bdist_wheel
41-
pip install advanced_descriptors --no-index -f dist
42-
py.test -vv {posargs:test}
40+
python setup.py bdist_wheel
41+
pip install advanced_descriptors --no-index -f dist
42+
py.test -vv {posargs:test}
43+
44+
[testenv:py38-nocov]
45+
commands =
46+
python setup.py bdist_wheel
47+
pip install advanced_descriptors --no-index -f dist
48+
py.test -vv {posargs:test}
4349

4450
[testenv:venv]
4551
commands = {posargs:}
4652

4753
[testenv:pep8]
4854
deps =
49-
flake8
50-
flake8-bugbear
51-
usedevelop = False
55+
flake8
56+
flake8-bugbear
5257
commands = flake8
5358

5459
[testenv:pep257]
5560
deps =
56-
pydocstyle
57-
usedevelop = False
61+
pydocstyle
5862
commands = pydocstyle advanced_descriptors
5963

64+
[testenv:doc8]
65+
deps =
66+
doc8
67+
Pygments
68+
commands = doc8 README.rst doc/source
69+
6070
[testenv:install]
6171
deps =
62-
usedevelop = False
6372
commands = pip install ./ -vvv -U
6473

6574
[testenv:pylint]
6675
deps =
67-
pylint>2.3
68-
isort[pyproject,requirements]
69-
-r{toxinidir}/CI_REQUIREMENTS.txt
76+
pylint>2.3
77+
isort[pyproject,requirements]
78+
-r{toxinidir}/CI_REQUIREMENTS.txt
7079
commands = pylint advanced_descriptors
7180

72-
[flake8]
73-
exclude =
74-
.venv,
75-
.git,
76-
.tox,
77-
dist,
78-
doc,
79-
*lib/python*,
80-
*egg,
81-
build,
82-
__init__.py,
83-
docs
84-
ignore =
85-
E203
86-
# whitespace before ':'
87-
show-pep8 = True
88-
show-source = True
89-
count = True
90-
max-line-length = 120
91-
92-
[pydocstyle]
93-
ignore =
94-
D401,
95-
D202,
96-
D203,
97-
D213
98-
# First line should be in imperative mood; try rephrasing
99-
# No blank lines allowed after function docstring
100-
# 1 blank line required before class docstring
101-
# Multi-line docstring summary should start at the second line
102-
10381
[testenv:docs]
10482
deps =
105-
sphinx
83+
sphinx
10684
commands = python setup.py build_sphinx
10785

10886
[testenv:readme]
10987
deps =
110-
readme-renderer
88+
readme-renderer
11189
commands = python setup.py check -r -s
11290

11391
[testenv:bandit]
@@ -116,19 +94,18 @@ commands = bandit -r advanced_descriptors
11694

11795
[testenv:dep-graph]
11896
deps =
119-
.
120-
pipdeptree
97+
.
98+
pipdeptree
12199
commands = pipdeptree
122100

123101
[testenv:black]
124102
deps =
125-
black
126-
usedevelop = False
103+
black
127104
commands =
128-
black advanced_descriptors
105+
black advanced_descriptors
129106

130107
[testenv:mypy]
131108
deps =
132-
mypy>=0.670
133-
-r{toxinidir}/CI_REQUIREMENTS.txt
109+
mypy>=0.670
110+
-r{toxinidir}/CI_REQUIREMENTS.txt
134111
commands = mypy --strict advanced_descriptors

0 commit comments

Comments
 (0)