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

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository python-textile.

commit ffa0e82d157d59e349e8ab96ea48e2a28f422c31
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 24 13:27:05 2017 +0300

    Convert from git-dpm to patches unapplied format.
---
 debian/.git-dpm            | 11 -----------
 debian/gbp.conf            |  2 ++
 tests/test_block.py        |  2 +-
 tests/test_cli.py          |  3 +--
 tests/test_getimagesize.py |  1 -
 tests/test_imagesize.py    |  2 --
 tests/test_textile.py      |  1 -
 7 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index ebe1b20..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-39ca12c5b4fe280130381e8e41bed874ad720da0
-39ca12c5b4fe280130381e8e41bed874ad720da0
-d58be00ec960e3f250402f28ea47cfe756fac9f4
-d58be00ec960e3f250402f28ea47cfe756fac9f4
-python-textile_2.3.5.orig.tar.gz
-13e888a43cc50b67651d21fca43066e90437e618
-44013
-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_block.py b/tests/test_block.py
index a4aec1a..0e6dc14 100644
--- a/tests/test_block.py
+++ b/tests/test_block.py
@@ -56,7 +56,7 @@ def test_blockcode_extended():
     assert result == expect
 
 def test_blockcode_in_README():
-    with open('../../../README.textile') as f:
+    with open('README.textile') as f:
         readme = ''.join(f.readlines())
     result = textile.textile(readme)
     with open('tests/fixtures/README.txt') as f:
diff --git a/tests/test_cli.py b/tests/test_cli.py
index e0a1234..bc1e28d 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1,9 +1,8 @@
 import six
-import sys
 import subprocess
 
 def test_console_script():
-    command = [sys.executable, '-m', 'textile', '../../../README.textile']
+    command = ['python', '-m', 'textile', 'README.textile']
     try:
         result = subprocess.check_output(command)
     except AttributeError:
diff --git a/tests/test_getimagesize.py b/tests/test_getimagesize.py
index 8b2e1a9..43f85e3 100644
--- a/tests/test_getimagesize.py
+++ b/tests/test_getimagesize.py
@@ -3,7 +3,6 @@ import pytest
 
 PIL = pytest.importorskip('PIL')
 
- at pytest.mark.skip(reason="Requires network access")
 def test_imagesize():
     assert getimagesize("http://www.google.com/intl/en_ALL/images/logo.gif") == (276, 110)
     assert getimagesize("http://bad.domain/") == ''
diff --git a/tests/test_imagesize.py b/tests/test_imagesize.py
index c953857..112989e 100644
--- a/tests/test_imagesize.py
+++ b/tests/test_imagesize.py
@@ -1,7 +1,5 @@
 import textile
-import pytest
 
- at pytest.mark.skip("Requires network access")
 def test_imagesize():
     imgurl = 'http://www.google.com/intl/en_ALL/images/srpr/logo1w.png'
     result = textile.tools.imagesize.getimagesize(imgurl)
diff --git a/tests/test_textile.py b/tests/test_textile.py
index 6d97561..dd069fb 100644
--- a/tests/test_textile.py
+++ b/tests/test_textile.py
@@ -84,7 +84,6 @@ def test_sanitize():
         message = '{0}'.format(e)
         assert "html5lib not available" in message
 
- at pytest.mark.skip("Requires network access")
 def test_imagesize():
     PIL = pytest.importorskip('PIL')
 

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