Skip to content

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

Merge branch 'master' into pylint

Adrián Chaves40ed184914b8
diff --cc .travis.yml
index 28a19f4f0,0e77af9fd..9840e3c20
--- a/.travis.yml
+++ b/.travis.yml
@@@ -7,16 -7,8 +7,10 @@@ branches
- /^\d\.\d+\.\d+(rc\d+|\.dev\d+)?$/
matrix:
include:
+ - env: TOXENV=flake8
+ python: 3.8
+ - env: TOXENV=pylint
- python: 3.7
- - env: TOXENV=py27
- python: 2.7
- - env: TOXENV=py27-pinned
- python: 2.7
- - env: TOXENV=py27-extra-deps
- python: 2.7
- - env: TOXENV=pypy
- python: 2.7
++ python: 3.8
- env: TOXENV=pypy3
python: 3.5
- env: TOXENV=py35
diff --cc tox.ini
index 428571ef2,cc3463a4d..ca4c7453f
--- a/tox.ini
+++ b/tox.ini
@@@ -97,20 -62,13 +62,27 @@@ basepython = pypy
commands =
py.test {posargs:scrapy tests}
+ [testenv:flake8]
+ basepython = python3.8
+ deps =
+ {[testenv]deps}
+ pytest-flake8
+ commands =
+ py.test --flake8 {posargs:scrapy tests}
++
+[testenv:pylint]
- basepython = python3.7
++basepython = python3.8
+deps =
- {[testenv:py35]deps}
++ {[testenv]deps}
+ # Optional dependencies
+ boto
+ reppy
+ robotexclusionrulesparser
+ # Test dependencies
+ pylint
+
+commands =
+ pylint conftest.py docs extras scrapy setup.py tests
[docs]
changedir = docs