[blockdiag] 11/29: Import Debian patch 1.1.6-1.2

[Andreas Tille]

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

tille pushed a commit to branch master
in repository blockdiag.

commit ff0511d733d28c41992fa68c1781bbec929cbdde
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat May 18 10:11:41 2013 +0200

    Import Debian patch 1.1.6-1.2
---
 debian/changelog              |  9 +++++
 debian/control                |  2 +-
 debian/patches/pep8-1.3.patch | 85 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1233654..e99030c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+blockdiag (1.1.6-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/pep8-1.3.patch: Backport patch from upstream to port to new
+    pep8 API. (Closes: #707119)
+  * debian/control: Bump Build-Depends on pep8 to >= 1.3.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sat, 18 May 2013 10:11:41 +0200
+
 blockdiag (1.1.6-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 472ec38..f5736a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: blockdiag
 Section: python
 Priority: optional
 Maintainer: Kouhei Maeda <mkouhei at palmtb.net>
-Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-unittest2, pep8, python-nose, python-zc.buildout, python-funcparserlib (>= 0.3.5), python-docutils, python-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
+Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-unittest2, pep8 (>= 1.3), python-nose, python-zc.buildout, python-funcparserlib (>= 0.3.5), python-docutils, python-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
 Standards-Version: 3.9.3
 X-Python-Version: 2.7
 Homepage: http://blockdiag.com/
diff --git a/debian/patches/pep8-1.3.patch b/debian/patches/pep8-1.3.patch
new file mode 100644
index 0000000..203462f
--- /dev/null
+++ b/debian/patches/pep8-1.3.patch
@@ -0,0 +1,85 @@
+Description: port to new pep8 API
+Origin: backport, https://bitbucket.org/tk0miya/blockdiag/commits/ac7bec9a
+Last-Update: 2013-05-18
+
+--- a/setup.py
++++ b/setup.py
+@@ -75,7 +75,7 @@
+      extras_require=dict(
+          test=[
+              'Nose',
+-             'pep8',
++             'pep8 >= 1.3',
+              'unittest2',
+          ],
+          pdf=[
+--- a/src/blockdiag/tests/test_pep8.py
++++ b/src/blockdiag/tests/test_pep8.py
+@@ -8,31 +8,43 @@
+ 
+ 
+ def test_pep8():
+-    arglist = [
+-        '--statistics',
+-        '--filename=*.py',
+-        '--show-source',
+-        '--repeat',
+-        '--exclude=SVGdraw.py',
+-        #'--show-pep8',
+-        #'-qq',
+-        #'-v',
+-        BASE_DIR,
+-    ]
++    arglist = [['statistics', True],
++               ['show-source', True],
++               ['repeat', True],
++               ['ignore', 'E501'],
++               ['exclude', ['SVGdraw.py']],
++               ['paths', [BASE_DIR]]]
+ 
+-    options, args = pep8.process_options(arglist)
+-    runner = pep8.input_file
++    pep8style = pep8.StyleGuide(arglist, parse_argv=False, config_file=True)
++    options = pep8style.options
++    if options.doctest:
++        import doctest
++        fail_d, done_d = doctest.testmod(report=False, verbose=options.verbose)
++        fail_s, done_s = selftest(options)
++        count_failed = fail_s + fail_d
++        if not options.quiet:
++            count_passed = done_d + done_s - count_failed
++            print("%d passed and %d failed." % (count_passed, count_failed))
++            print("Test failed." if count_failed else "Test passed.")
++        if count_failed:
++            sys.exit(1)
++    if options.testsuite:
++        init_tests(pep8style)
++    report = pep8style.check_files()
++    if options.statistics:
++        report.print_statistics()
++    if options.benchmark:
++        report.print_benchmark()
++    if options.testsuite and not options.quiet:
++        report.print_results()
++    if report.total_errors:
++        if options.count:
++            sys.stderr.write(str(report.total_errors) + '\n')
++        sys.exit(1)
+ 
+-    for path in args:
+-        if os.path.isdir(path):
+-            pep8.input_dir(path, runner=runner)
+-        elif not pep8.excluded(path):
+-            options.counters['files'] += 1
+-            runner(path)
+-
+-    pep8.print_statistics()
+-    errors = pep8.get_count('E')
+-    warnings = pep8.get_count('W')
++    # reporting errors (additional summary)
++    errors = report.get_count('E')
++    warnings = report.get_count('W')
+     message = 'pep8: %d errors / %d warnings' % (errors, warnings)
+     print message
+-    assert errors + warnings == 0, message
++    assert report.total_errors == 0, message
diff --git a/debian/patches/series b/debian/patches/series
index d7bfde7..89292dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 update_egg-info
 fix-pep8-violations
+pep8-1.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/blockdiag.git