RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1622 from sibiryakov/twisted-1550-fix 

[MRG+1] Ignoring xlib/tx folder, depending on Twisted version.
This commit is contained in:
Daniel Graña 2015-12-04 09:40:35 -03:00
parent 015cd78940 c4d29ecaef
commit 21f638b139
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conftest.py
View File

@ -1,6 +1,7 @@
import glob
import six
import pytest
from twisted import version as twisted_version
def _py_files(folder):
@ -26,6 +27,9 @@ collect_ignore = [
] + _py_files("scrapy/contrib") + _py_files("scrapy/contrib_exp")
if (twisted_version.major, twisted_version.minor, twisted_version.micro) >= (15, 5, 0):
collect_ignore += _py_files("scrapy/xlib/tx")
if six.PY3:
for line in open('tests/py3-ignores.txt'):