Control: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for blockdiag (versioned as 1.1.6-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards -- Sebastian Ramacher
diff -Nru blockdiag-1.1.6/debian/changelog blockdiag-1.1.6/debian/changelog --- blockdiag-1.1.6/debian/changelog 2012-07-26 00:09:30.000000000 +0200 +++ blockdiag-1.1.6/debian/changelog 2013-05-18 10:12:30.000000000 +0200 @@ -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 <sramac...@debian.org> Sat, 18 May 2013 10:11:41 +0200 + blockdiag (1.1.6-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru blockdiag-1.1.6/debian/control blockdiag-1.1.6/debian/control --- blockdiag-1.1.6/debian/control 2012-06-10 18:28:13.000000000 +0200 +++ blockdiag-1.1.6/debian/control 2013-05-18 09:59:18.000000000 +0200 @@ -2,7 +2,7 @@ Section: python Priority: optional Maintainer: Kouhei Maeda <mkou...@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 -Nru blockdiag-1.1.6/debian/patches/pep8-1.3.patch blockdiag-1.1.6/debian/patches/pep8-1.3.patch --- blockdiag-1.1.6/debian/patches/pep8-1.3.patch 1970-01-01 01:00:00.000000000 +0100 +++ blockdiag-1.1.6/debian/patches/pep8-1.3.patch 2013-05-18 10:06:17.000000000 +0200 @@ -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 -Nru blockdiag-1.1.6/debian/patches/series blockdiag-1.1.6/debian/patches/series --- blockdiag-1.1.6/debian/patches/series 2012-07-26 00:08:51.000000000 +0200 +++ blockdiag-1.1.6/debian/patches/series 2013-05-18 09:59:49.000000000 +0200 @@ -1,2 +1,3 @@ update_egg-info fix-pep8-violations +pep8-1.3.patch
signature.asc
Description: Digital signature