From 7dfa979197620749128ee062e8771a4283bbf771 Mon Sep 17 00:00:00 2001 From: Alexander Sibiryakov Date: Wed, 2 Dec 2015 17:05:44 +0100 Subject: [PATCH] Ignoring xlib/tx folder, depending on Twisted version. --- conftest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conftest.py b/conftest.py index 5829f2952..23a05dd8d 100644 --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,7 @@ import glob import six import pytest +from twisted import version as twisted_version def _py_files(folder): @@ -21,6 +22,9 @@ collect_ignore = [ "scrapy/spider.py", ] + _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'):