[Python-modules-commits] [python-scrapy] 03/12: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository python-scrapy.

commit 24948a6e20375296a5e2fb3d203dab401ff82a24
Merge: 09f0148 30df81d
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 28 20:53:32 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...with-unattainable-dependencies-in-Python3.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_linkextractors_deprecated.py            |  4 +++
 tests/test_proxy_connect.py                        |  3 ++
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 69f3ea9,0000000..836ab00
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
- 19fef7aa630ba8b7a3310e6e822c5a5831301cbf
- 19fef7aa630ba8b7a3310e6e822c5a5831301cbf
++30df81d73008c07c8fdd1b1d3ee4d3657e727404
++30df81d73008c07c8fdd1b1d3ee4d3657e727404
 +48a06fc0804f079995bf919f096c16f6d31fd36d
 +48a06fc0804f079995bf919f096c16f6d31fd36d
 +python-scrapy_1.3.0.orig.tar.gz
 +04f9add4fef322aed081a94cd64e37945d8b9d7d
 +1060716
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Skip-tests-with-unattainable-dependencies-in-Python3.patch
index 0000000,0000000..7d791c6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Skip-tests-with-unattainable-dependencies-in-Python3.patch
@@@ -1,0 -1,0 +1,40 @@@
++From 30df81d73008c07c8fdd1b1d3ee4d3657e727404 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 480ebe7,0000000..d433b63
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-spelling-error-in-manpage.patch
++0002-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