[Python-modules-commits] [python-scrapy] 04/06: 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 8cfef5d5454a908d902a2f0803c999a0f2f92390
Merge: a1d3bff 4179eb6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 20:38:27 2017 +0100

    merge patched into master

 .bumpversion.cfg                                   |  2 +-
 debian/.git-dpm                                    |  6 +++---
 ...with-unattainable-dependencies-in-Python3.patch |  2 +-
 docs/news.rst                                      | 14 ++++++++++++-
 docs/topics/settings.rst                           | 23 ++++++++++++++++++++++
 scrapy/VERSION                                     |  2 +-
 scrapy/commands/runspider.py                       |  1 +
 scrapy/commands/settings.py                        |  3 ++-
 scrapy/commands/startproject.py                    |  5 +++--
 scrapy/commands/version.py                         |  3 ++-
 scrapy/settings/default_settings.py                |  1 +
 scrapy/spiderloader.py                             | 12 +++++++----
 tests/test_spiderloader/__init__.py                |  9 ++++++++-
 13 files changed, 67 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 929f8d4,0000000..e740a4f
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
- ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b
- ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b
- a24b933ee858b766e10e0d7761ac6327d43c757d
++4179eb647d5367d7e790bf9b7175d2aa0e673cf0
++4179eb647d5367d7e790bf9b7175d2aa0e673cf0
++e393c0a03fdd919e9ff3129345c7abd4724b7d1b
 +e393c0a03fdd919e9ff3129345c7abd4724b7d1b
 +python-scrapy_1.3.3.orig.tar.gz
 +006a3106f78e876891e18404ebe21eb63540c12d
 +1064996
 +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 2a7b022,0000000..5cc47eb
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 ae17e861322d68cf4b4e205823c2c0b8fa1b7e4b Mon Sep 17 00:00:00 2001
++From 4179eb647d5367d7e790bf9b7175d2aa0e673cf0 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-scrapy.git