Merge ca2d644 into 1591c61

.travis.yml

@@ -10,11 +10,11 @@ env:
 - XDIST=1 INSTALL=install
 - XDIST=0 INSTALL=develop
 install:
-- pip install -r requirements-test.txt
+- "pip install -r requirements-test.txt"
 - python setup.py $INSTALL
 - pip install pytest_elasticsearch[tests] coveralls wheel
 script:
-- py.test -n $XDIST --showlocals --verbose --cov src/pytest_elasticsearch
+- py.test -n $XDIST --cov src/pytest_elasticsearch
 - pylama
 - pyroma .
 after_success:

pylama.ini

@@ -3,7 +3,7 @@
 # D105: Missing docstring in magic method [pep257]
 
 [pylama]
-linters = pep8,pyflakes,pep257
+linters = pep8,pyflakes,pydocstyle
 skip = docs/*,\
     build/*
 ignore = D203,\

pytest.ini

@@ -1,4 +1,3 @@
 [pytest]
- # We must not use the mongo plugin in its tests.
-addopts = -p no:elasticsearch --max-slave-restart=0
-testpaths = tests
+addopts = --max-slave-restart=0 --showlocals --verbose
+testpaths = tests

requirements-test.txt

@@ -1,10 +1,10 @@
 # test runs requirements (versions we'll be testing against) - automatically updated by requires.io
 coverage==4.2 # pytest-cov
-pyflakes==1.2.3
-pep257==0.7.0
+pyflakes==1.3.0
+pydocstyle==1.0.0
 pep8==1.7.0
 mccabe==0.5.2
 pyroma==2.0.2
-pytest==2.8.7 #  rq.filter: !=2.9.0,!=2.9.1,!=2.9.2
+pytest==3.0.2 #  rq.filter: !=2.9.0,!=2.9.1,!=2.9.2
 path.py==8.2.1
 port-for==0.3.1

setup.py

@@ -45,7 +45,7 @@ def read(fname):
 test_requires = [
     'pytest-cov==2.3.1',
     'pytest-xdist==1.15.0',
-    'pylama==7.0.9',
+    'pylama==7.1.0',
     'mock==2.0.0',
 ]
 

tests/conftest.py

@@ -1 +1 @@
-from pytest_elasticsearch.plugin import *  # noqa
+"""Tests main conftest file."""