[med-svn] [python-cutadapt] 07/08: Update quilt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-cutadapt.

commit a032c8c7caec122e01c247ec931de29d91dd05b2
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 10 13:23:31 2018 +0100

    Update quilt patches
---
 .../0002-Fix-encoding-issue-in-setup.py.patch      | 23 --------------
 debian/patches/0003_fixtest.patch                  | 37 ----------------------
 debian/patches/cython_version.patch                |  8 ++---
 debian/patches/series                              |  2 --
 4 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch b/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch
deleted file mode 100644
index 2c7de72..0000000
--- a/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Kevin Murray <kdmfoss at gmail.com>
-Date: Fri, 2 Dec 2016 13:59:59 +1100
-Subject: Fix encoding issue in setup.py
-
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0a6be71..ac2d66c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -116,8 +116,8 @@ class sdist(versioneer_sdist):
- cmdclass['build_ext'] = build_ext
- cmdclass['sdist'] = sdist
- 
--with open('README.rst') as f:
--	long_description = f.read()
-+with open('README.rst', 'rb') as f:
-+	long_description = f.read().decode('utf8')
- 
- setup(
- 	name = 'cutadapt',
diff --git a/debian/patches/0003_fixtest.patch b/debian/patches/0003_fixtest.patch
deleted file mode 100644
index e851dcd..0000000
--- a/debian/patches/0003_fixtest.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Fri, 17 Mar 2017 21:20:50 +0100
-Description: Make sure test suite will find utils
-
---- a/tests/testcolorspace.py
-+++ b/tests/testcolorspace.py
-@@ -3,7 +3,7 @@
- 
- from cutadapt.colorspace import encode, decode
- from cutadapt.scripts.cutadapt import main
--from .utils import run, datapath
-+from utils import run, datapath
- 
- # If there are any unknown characters in the test sequence,
- # round tripping will only work if all characters after the
---- a/tests/testpaired.py
-+++ b/tests/testpaired.py
-@@ -4,7 +4,7 @@
- import shutil
- from nose.tools import raises
- from cutadapt.scripts import cutadapt
--from .utils import run, assert_files_equal, datapath, cutpath, redirect_stderr, temporary_path
-+from utils import run, assert_files_equal, datapath, cutpath, redirect_stderr, temporary_path
- 
- 
- def run_paired(params, in1, in2, expected1, expected2):
---- a/tests/tests.py
-+++ b/tests/tests.py
-@@ -9,7 +9,7 @@
- from nose.tools import raises
- from cutadapt.scripts import cutadapt
- from cutadapt.compat import StringIO
--from .utils import run, assert_files_equal, datapath, cutpath, redirect_stderr, temporary_path
-+from utils import run, assert_files_equal, datapath, cutpath, redirect_stderr, temporary_path
- 
- 
- def test_example():
diff --git a/debian/patches/cython_version.patch b/debian/patches/cython_version.patch
index 01091f4..8b75f8f 100644
--- a/debian/patches/cython_version.patch
+++ b/debian/patches/cython_version.patch
@@ -6,16 +6,14 @@ Subject: cython_version
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index dbb2001..0a6be71 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -10,7 +10,7 @@ from distutils.command.sdist import sdist as _sdist
+@@ -10,7 +10,7 @@ from distutils.command.sdist import sdis
  from distutils.command.build_ext import build_ext as _build_ext
  import versioneer
  
 -MIN_CYTHON_VERSION = '0.24'
 +MIN_CYTHON_VERSION = '0.23.2'
  
- if sys.version_info < (2, 6):
- 	sys.stdout.write("At least Python 2.6 is required.\n")
+ if sys.version_info < (2, 7):
+ 	sys.stdout.write("At least Python 2.7 is required.\n")
diff --git a/debian/patches/series b/debian/patches/series
index 04112ea..80f9065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 cython_version.patch
-0002-Fix-encoding-issue-in-setup.py.patch
-0003_fixtest.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cutadapt.git