Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge branch 'master' into patch-1
Paul Trembertha347c75baa78
diff --cc .travis.ymlindex ac79a0425,52fbf02ae..6f3ab511f--- a/.travis.yml+++ b/.travis.yml@@@ -5,13 -4,21 +4,21 @@@ branchesonly:- master- /^\d\.\d+$/- - /^\d\.\d+\.\d+(rc\d+|dev\d+)?$/+ - /^\d\.\d+\.\d+(rc\d+|\.dev\d+)?$/- env:- - TOXENV=py27- - TOXENV=jessie- - TOXENV=py33- - TOXENV=py35- - TOXENV=docs+ matrix:+ include:+ - python: 2.7+ env: TOXENV=py27+ - python: 2.7+ env: TOXENV=jessie+ - python: 3.3+ env: TOXENV=py33+ - python: 3.5+ env: TOXENV=py35+ - python: 3.6+ env: TOXENV=py36+ - python: 3.6+ env: TOXENV=docsinstall:- pip install -U tox twine wheel codecovscript: tox