Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions pytest_splinter/decorators.py

This file was deleted.

1 change: 1 addition & 0 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ pytest-localserver
pylama
pylama_pylint
astroid>=1.4.5
selenium<3
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ commands=
basepython=python2.7
deps =
{[testenv]deps}
hg+https://bitbucket.org/pytest-dev/py#egg=py
git+https://github.com/pytest-dev/py.git@master#egg=py
git+https://github.com/pytest-dev/pytest.git@features#egg=pytest

[pytest]
Expand All @@ -46,7 +46,7 @@ addopts = -vvl -r w
format = pep8
skip = */.tox/*,*/.env/*
linters = pylint,mccabe,pep8,pep257
ignore = F0401,C0111,E731,D100,W0621,W0108,R0201,W0401,W0614,W0212,C901,R0914,D211
ignore = F0401,C0111,E731,D100,W0621,W0108,R0201,W0401,W0614,W0212,C901,R0914,D211,D213,D403

[pylama:pep8]
max_line_length = 120
Expand Down