Skip to content

Commit

Permalink
Collect the list of packages not working on python3
Browse files Browse the repository at this point in the history
  • Loading branch information
dangra committed Jul 31, 2014
1 parent 6c402d3 commit 70ee66b
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ env:
- TOXENV=py27
- TOXENV=precise
- TOXENV=py33
matrix:
allow_failures:
- env: TOXENV=py33
install:
- "./.travis-workarounds.sh"
- pip install -U tox
Expand Down
5 changes: 4 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

import six
import pytest
from twisted.python import log

Expand All @@ -8,6 +8,9 @@
if 'django' not in optional_features:
collect_ignore.append("tests/test_djangoitem/models.py")

if six.PY3:
for fn in open('tests/py3-ignores.txt'):
collect_ignore.append(fn.strip())

class LogObservers:
"""Class for keeping track of log observers across test modules"""
Expand Down
2 changes: 0 additions & 2 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

[pytest]
usefixtures = chdir setlog
python_files=test_*.py __init__.py
addopts = --doctest-modules --assert=plain
twisted = 1

83 changes: 83 additions & 0 deletions tests/py3-ignores.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
tests/test_closespider.py
tests/test_cmdline/__init__.py
tests/test_command_fetch.py
tests/test_command_shell.py
tests/test_commands.py
tests/test_command_version.py
tests/test_contracts.py
tests/test_contrib_exporter.py
tests/test_contrib_feedexport.py
tests/test_contrib_linkextractors.py
tests/test_contrib_loader.py
tests/test_crawl.py
tests/test_djangoitem/__init__.py
tests/test_downloader_handlers.py
tests/test_downloadermiddleware_ajaxcrawlable.py
tests/test_downloadermiddleware_cookies.py
tests/test_downloadermiddleware_decompression.py
tests/test_downloadermiddleware_defaultheaders.py
tests/test_downloadermiddleware_downloadtimeout.py
tests/test_downloadermiddleware_httpauth.py
tests/test_downloadermiddleware_httpcache.py
tests/test_downloadermiddleware_httpcompression.py
tests/test_downloadermiddleware_httpproxy.py
tests/test_downloadermiddleware.py
tests/test_downloadermiddleware_redirect.py
tests/test_downloadermiddleware_retry.py
tests/test_downloadermiddleware_robotstxt.py
tests/test_downloadermiddleware_stats.py
tests/test_downloadermiddleware_useragent.py
tests/test_dupefilter.py
tests/test_engine.py
tests/test_http_cookies.py
tests/test_http_headers.py
tests/test_http_request.py
tests/test_http_response.py
tests/test_link.py
tests/test_logformatter.py
tests/test_log.py
tests/test_mail.py
tests/test_middleware.py
tests/test_pipeline_files.py
tests/test_pipeline_images.py
tests/test_pipeline_media.py
tests/test_proxy_connect.py
tests/test_responsetypes.py
tests/test_selector_csstranslator.py
tests/test_selector_lxmldocument.py
tests/test_selector.py
tests/test_settings/__init__.py
tests/test_spidermanager/__init__.py
tests/test_spidermanager/test_spiders/__init__.py
tests/test_spidermanager/test_spiders/spider0.py
tests/test_spidermanager/test_spiders/spider1.py
tests/test_spidermanager/test_spiders/spider2.py
tests/test_spidermanager/test_spiders/spider3.py
tests/test_spidermanager/test_spiders/spider4.py
tests/test_spidermiddleware_depth.py
tests/test_spidermiddleware_httperror.py
tests/test_spidermiddleware_offsite.py
tests/test_spidermiddleware_referer.py
tests/test_spidermiddleware_urllength.py
tests/test_spider.py
tests/test_squeue.py
tests/test_stats.py
tests/test_toplevel.py
tests/test_utils_conf.py
tests/test_utils_defer.py
tests/test_utils_gz.py
tests/test_utils_httpobj.py
tests/test_utils_iterators.py
tests/test_utils_jsonrpc.py
tests/test_utils_misc/__init__.py
tests/test_utils_python.py
tests/test_utils_reqser.py
tests/test_utils_request.py
tests/test_utils_response.py
tests/test_utils_serialize.py
tests/test_utils_signal.py
tests/test_utils_sitemap.py
tests/test_utils_spider.py
tests/test_utils_template.py
tests/test_utils_url.py
tests/test_webclient.py
2 changes: 1 addition & 1 deletion tests/spiders.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""

import time
from urllib import urlencode
from six.moves.urllib.parse import urlencode

from scrapy.spider import Spider
from scrapy.http import Request
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ deps =
mock
pytest>=2.6.0
pytest-twisted
commands =
py.test {posargs:tests}

[testenv:py34]
basepython = python3.4
deps = {[testenv:py33]deps}
commands =
py.test {posargs:tests}

[testenv:windows]
commands =
Expand Down

0 comments on commit 70ee66b

Please sign in to comment.