[Python-modules-commits] [python-scrapy] 01/04: Convert from git-dpm to patches unapplied format

[Michael Fladischer]

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

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

commit 870b8656cf4aded4db1a2eed7a95b1b9c89c9118
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Aug 29 20:59:34 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm                         | 11 -----------
 debian/gbp.conf                         |  2 ++
 tests/test_linkextractors_deprecated.py |  4 ----
 tests/test_proxy_connect.py             |  3 ---
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 8343946..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-283903b41a8d3767667b264c3939ddbce7f643e4
-283903b41a8d3767667b264c3939ddbce7f643e4
-f2dd115e9923fae44ed807f9a5435fafa6d26fdd
-f2dd115e9923fae44ed807f9a5435fafa6d26fdd
-python-scrapy_1.4.0.orig.tar.gz
-5e1edb9dfe128ce78cd413ca83a02f96ba57b6a2
-1114816
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/tests/test_linkextractors_deprecated.py b/tests/test_linkextractors_deprecated.py
index ee8794c..1366971 100644
--- a/tests/test_linkextractors_deprecated.py
+++ b/tests/test_linkextractors_deprecated.py
@@ -1,9 +1,5 @@
 # -*- 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 7e44817..6213a51 100644
--- a/tests/test_proxy_connect.py
+++ b/tests/test_proxy_connect.py
@@ -2,9 +2,6 @@ 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