Skip to content

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

Merge branch 'master' into test-ubuntu-bionic

Adrián Chaves98835a0d40ef
diff --cc .travis.yml
index 02c8885e5,6bde973f4..169a0caf1
--- a/.travis.yml
+++ b/.travis.yml
@@@ -11,28 -11,23 +11,26 @@@ matrix
python: 3.8
- env: TOXENV=flake8
python: 3.8
+ - env: TOXENV=docs
+ python: 3.7 # Keep in sync with .readthedocs.yml
+
- env: TOXENV=pypy3
- - env: TOXENV=py35
- python: 3.5
+ - python: 3.5
- env: TOXENV=pinned
python: 3.5
- - env: TOXENV=py35-asyncio
+ - env: TOXENV=asyncio
python: 3.5.2
- - env: TOXENV=py36
- python: 3.6
- - env: TOXENV=py37
- python: 3.7
- - env: TOXENV=py38
+ - python: 3.6
+ - python: 3.7
+ - env: PYPI_RELEASE_JOB=true
python: 3.8
+ dist: bionic
- env: TOXENV=extra-deps
python: 3.8
+ dist: bionic
- - env: TOXENV=py38-asyncio
+ - env: TOXENV=asyncio
python: 3.8
+ dist: bionic
- - env: TOXENV=docs
- python: 3.7 # Keep in sync with .readthedocs.yml
install:
- |
if [ "$TOXENV" = "pypy3" ]; then