Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Merge branch 'master' into docs-py38

Adrián Chaves00517ec273cb
diff --cc .travis.yml
index c9c64e990,4e28d6f11..c870934e1
--- a/.travis.yml
+++ b/.travis.yml
@@@ -23,10 -22,10 +22,10 @@@ matrix
python: 3.7
- env: TOXENV=py38
python: 3.8
- - env: TOXENV=py38-extra-deps
+ - env: TOXENV=extra-deps
python: 3.8
- env: TOXENV=docs
- python: 3.6
+ python: 3.8
install:
- |
if [ "$TOXENV" = "pypy3" ]; then
diff --cc tox.ini
index 195cc106a,72e40696b..1ec8f52e4
--- a/tox.ini
+++ b/tox.ini
@@@ -86,21 -77,18 +77,21 @@@ deps
-rdocs/requirements.txt
[testenv:docs]
- basepython = {[latest]basepython}
++basepython = python3
changedir = {[docs]changedir}
deps = {[docs]deps}
commands =
sphinx-build -W -b html . {envtmpdir}/html
[testenv:docs-coverage]
- basepython = {[latest]basepython}
++basepython = python3
changedir = {[docs]changedir}
deps = {[docs]deps}
commands =
sphinx-build -b coverage . {envtmpdir}/coverage
[testenv:docs-links]
- basepython = {[latest]basepython}
++basepython = python3
changedir = {[docs]changedir}
deps = {[docs]deps}
commands =