Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge branch 'master' into user-friendlier-tox
Adrián Chavesd7b1c138f189
diff --cc docs/contributing.rstindex c4cb605ab,234c4bcee..988015e61--- a/docs/contributing.rst+++ b/docs/contributing.rst@@@ -216,15 -225,16 +217,16 @@@ the tests with Python 3.6 use:tox -e py36- You can also specify a comma-separated list of environmets, and use `tox’s- parallel mode`_ to run the tests on multiple environments in parallel::+ You can also specify a comma-separated list of environmets, and use :ref:`tox’s+ parallel mode <tox:parallel_mode>` to run the tests on multiple environments in+ parallel::- tox -e py27,py36 -p auto+ tox -e py37,py38 -p auto- To pass command-line options to pytest_, add them after ``--`` in your call to- tox_. Using ``--`` overrides the default positional arguments defined in- ``tox.ini``, so you must include those default positional arguments- (``scrapy tests``) after ``--`` as well::+ To pass command-line options to :doc:`pytest <pytest:index>`, add them after+ ``--`` in your call to :doc:`tox <tox:index>`. Using ``--`` overrides the+ default positional arguments defined in ``tox.ini``, so you must include those+ default positional arguments (``scrapy tests``) after ``--`` as well::tox -- scrapy tests -x # stop after first failure