Merge 0e97724 into 661c265

ClearcodeHQ · Jul 5, 2016 · a6c3565 · a6c3565
2 parents 661c265 + 0e97724
commit a6c3565
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ install:
   - $INSTALLATION
   - pip install pytest_dbfixtures[mongodb,redis,rabbitmq,mysql,postgresql,elasticsearch,dynamodb,tests] coveralls wheel
 script:
-  - py.test -n $XDIST --max-slave-restart=0 --showlocals --verbose --cov pytest_dbfixtures tests -p no:dbfixtures
+  - py.test -n $XDIST --max-slave-restart=0 --showlocals --verbose --cov pytest_dbfixtures tests
   - pylama
 after_success:
   - coveralls

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -8,7 +8,7 @@ psycopg2==2.6.1
 pyaml==15.8.2
 pymlconf==0.4.0
 pymongo==3.2.2
-pytest==2.8.7
+pytest==2.9.2
 rabbitpy==0.27.1
 redis==2.10.5
 pyflakes==1.2.3

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1 +0,0 @@
-from pytest_dbfixtures.plugin import *  # noqa