diff options
| -rw-r--r-- | debian/patches/debian/0001-fix-test-with-python3.patch | 33 | ||||
| -rw-r--r-- | debian/patches/debian/0001-python3-hook.patch (renamed from debian/patches/debian/0002-python3-hook.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 1 insertions, 35 deletions
diff --git a/debian/patches/debian/0001-fix-test-with-python3.patch b/debian/patches/debian/0001-fix-test-with-python3.patch deleted file mode 100644 index 4844467..0000000 --- a/debian/patches/debian/0001-fix-test-with-python3.patch +++ /dev/null @@ -1,33 +0,0 @@ -Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Description: replace readfp with Python2 read_file function, to fix a test failure: - https://github.com/jorisroovers/gitlint/pull/104 - -====================================================================== -FAIL: test_config_file (test_cli.CLITests) -Test for --config option ----------------------------------------------------------------------- -Traceback (most recent call last): - File "/usr/lib/python3.7/unittest/mock.py", line 1248, in patched - return func(*args, **keywargs) - File "/<<PKGBUILDDIR>>/gitlint/tests/test_cli.py", line 372, in test_config_file - self.assertEqual(result.output, "") -AssertionError: "/<<PKGBUILDDIR>>/git[197 chars]od\n" != '' -- /<<PKGBUILDDIR>>/gitlint/config.py:366: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead. -- parser.readfp(config_file, filename) # pylint: disable=deprecated-method ---- - gitlint/config.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff -Naurp gitlint.orig/gitlint/config.py gitlint/gitlint/config.py ---- gitlint.orig/gitlint/config.py -+++ gitlint/gitlint/config.py -@@ -428,8 +428,7 @@ class LintConfigBuilder(object): - parser = ConfigParser() - - with io.open(filename, encoding=DEFAULT_ENCODING) as config_file: -- # readfp() is deprecated in python 3.2+, but compatible with 2.7 -- parser.readfp(config_file, filename) # pylint: disable=deprecated-method -+ parser.read_file(config_file) - - for section_name in parser.sections(): - for option_name, option_value in parser.items(section_name): diff --git a/debian/patches/debian/0002-python3-hook.patch b/debian/patches/debian/0001-python3-hook.patch index 74cdcea..74cdcea 100644 --- a/debian/patches/debian/0002-python3-hook.patch +++ b/debian/patches/debian/0001-python3-hook.patch diff --git a/debian/patches/series b/debian/patches/series index 3bfdd92..bc40938 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -debian/0001-fix-test-with-python3.patch -debian/0002-python3-hook.patch +debian/0001-python3-hook.patch |