[Python-modules-commits] [python-scrapy] 04/06: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Fri Feb 17 09:18:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-scrapy.
commit c0593031459b44a655c639e26563bc487b84a889
Merge: 37f1cfb ae17e86
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Feb 17 09:29:23 2017 +0100
merge patched into master
.bumpversion.cfg | 2 +-
.travis.yml | 47 ++++++++++---
CODE_OF_CONDUCT.md | 80 ++++++++++++++--------
README.rst | 7 +-
artwork/{README => README.rst} | 2 +
debian/.git-dpm | 6 +-
.../0001-Fix-spelling-error-in-manpage.patch | 34 ---------
...ith-unattainable-dependencies-in-Python3.patch} | 2 +-
debian/patches/series | 3 +-
docs/{README => README.rst} | 2 +
docs/intro/tutorial.rst | 12 ++--
docs/news.rst | 58 ++++++++++++++++
docs/topics/architecture.rst | 2 +-
docs/topics/commands.rst | 6 ++
docs/topics/downloader-middleware.rst | 5 +-
docs/topics/request-response.rst | 12 +++-
docs/topics/selectors.rst | 38 ++++++++++
docs/topics/spider-middleware.rst | 2 +-
docs/topics/spiders.rst | 31 +++++++++
extras/scrapy.1 | 4 +-
requirements.txt | 2 +-
scrapy/VERSION | 2 +-
scrapy/commands/view.py | 5 +-
scrapy/core/downloader/handlers/http.py | 8 +--
scrapy/core/downloader/handlers/http11.py | 11 ++-
scrapy/core/downloader/tls.py | 28 +++++---
scrapy/downloadermiddlewares/redirect.py | 15 ++--
scrapy/http/response/text.py | 4 +-
scrapy/item.py | 3 +
scrapy/linkextractors/__init__.py | 6 +-
scrapy/resolver.py | 7 +-
scrapy/settings/__init__.py | 16 ++++-
scrapy/templates/project/module/settings.py.tmpl | 2 +-
scrapy/utils/conf.py | 9 +++
scrapy/utils/reqser.py | 6 +-
sep/{README => README.rst} | 2 +
setup.py | 3 +-
tests/mockserver.py | 39 +++--------
tests/test_crawl.py | 13 ++--
tests/test_downloader_handlers.py | 49 +++++--------
tests/test_downloadermiddleware_retry.py | 5 +-
tests/test_http_response.py | 32 +++++++++
tests/test_item.py | 52 +++++++++++++-
tests/test_pipeline_files.py | 2 +-
tests/test_settings/__init__.py | 12 ++++
tests/test_utils_conf.py | 21 ++++++
tests/test_utils_reqser.py | 13 +++-
tox.ini | 21 ++++--
48 files changed, 519 insertions(+), 224 deletions(-)
diff --cc debian/.git-dpm
index 7b376f6,0000000..b3fcb66
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 30df81d73008c07c8fdd1b1d3ee4d3657e727404
- 30df81d73008c07c8fdd1b1d3ee4d3657e727404
- 48a06fc0804f079995bf919f096c16f6d31fd36d
++ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b
++ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b
++a24b933ee858b766e10e0d7761ac6327d43c757d
+a24b933ee858b766e10e0d7761ac6327d43c757d
+python-scrapy_1.3.2.orig.tar.gz
+579650fd52a61ed98a9bc338bbabe85ca75ab247
+1064511
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
index 7d791c6,0000000..2a7b022
mode 100644,000000..100644
--- a/debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
+++ b/debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 30df81d73008c07c8fdd1b1d3ee4d3657e727404 Mon Sep 17 00:00:00 2001
++From ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Sat, 28 Jan 2017 20:50:33 +0100
+Subject: Skip tests with unattainable dependencies in Python3.
+
+Both libmproxy and sgmllib are not available for Python3. libmproxy might be in
+the future.
+---
+ tests/test_linkextractors_deprecated.py | 4 ++++
+ tests/test_proxy_connect.py | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/tests/test_linkextractors_deprecated.py b/tests/test_linkextractors_deprecated.py
+index 36dfe17..c45937b 100644
+--- a/tests/test_linkextractors_deprecated.py
++++ b/tests/test_linkextractors_deprecated.py
+@@ -1,5 +1,9 @@
+ # -*- coding: utf-8 -*-
+ import unittest
++
++import pytest
++pytest.importorskip('sgmllib')
++
+ from scrapy.linkextractors.regex import RegexLinkExtractor
+ from scrapy.http import HtmlResponse
+ from scrapy.link import Link
+diff --git a/tests/test_proxy_connect.py b/tests/test_proxy_connect.py
+index 0f06fd5..e0bf2c4 100644
+--- a/tests/test_proxy_connect.py
++++ b/tests/test_proxy_connect.py
+@@ -2,6 +2,9 @@ import json
+ import os
+ import time
+
++import pytest
++pytest.importorskip('libmproxy')
++
+ from threading import Thread
+ from libmproxy import controller, proxy
+ from netlib import http_auth
diff --cc debian/patches/series
index d433b63,0000000..0da7cdf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Fix-spelling-error-in-manpage.patch
- 0002-Skip-tests-with-unattainable-dependencies-in-Python3.patch
++0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-scrapy.git
More information about the Python-modules-commits
mailing list