Fix #2014: Drop pytest-timeout plugin

CONTRIBUTING.rst

@@ -49,7 +49,7 @@ For standard python *venv*:
    $ python3 -m venv venv
    $ . venv/bin/activate
 
-For *virtualenvwrapper* (my choice):
+For *virtualenvwrapper*:
 
 .. code-block:: shell
 
@@ -65,23 +65,16 @@ After that please install libraries required for development:
 
    $ pip install -r requirements-dev.txt
 
-We also recommend to install ipdb_ but it's on your own:
-
-.. code-block:: shell
-
-   $ pip install ipdb
-
 .. note::
-  If you plan to use ``ipdb`` within the test suite, execute:
+  If you plan to use ``pdb`` or ``ipdb`` within the test suite, execute:
 
 .. code-block:: shell
 
-    $ py.test tests -s -p no:timeout
+    $ py.test tests -s
 
-  command to run the tests with disabled timeout guard and output
-  capturing.
+  command to run the tests with disabled output capturing.
 
-Congratulations, you are ready to run the test suite
+Congratulations, you are ready to run the test suite!
 
 
 Run aiohttp test suite

changes/2014.misc

@@ -0,0 +1 @@
+Drop `pytest-timeout` plugin.

requirements-ci.txt

@@ -15,7 +15,6 @@ sphinxcontrib-newsfeed==0.1.4
 pytest==3.1.2
 pytest-cov==2.5.1
 pytest-mock==1.6.0
-pytest-timeout==1.2.0
 gunicorn==19.7.1
 pygments>=2.1
 #aiodns  # Enable from .travis.yml as required c-ares will not build on windows

setup.cfg

@@ -10,7 +10,6 @@ max-line-length=79
 
 [tool:pytest]
 testpaths = tests
-timeout = 4
 
 [isort]
 known_third_party=jinja2