[Python-modules-commits] [python-markdown] 03/06: Cherry-pick upstream commit to fix Pygments tests.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Jan 29 05:32:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository python-markdown.
commit c6f7031f8f66aef28b72749263f83f04c220df2c
Merge: e6fb4f6 e0f11f7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Jan 29 08:14:45 2016 +0300
Cherry-pick upstream commit to fix Pygments tests.
Closes: #813028.
debian/.git-dpm | 4 +-
debian/changelog | 2 +
...highlighting-tests-work-with-Pygments-2.1.patch | 100 +++++++++++++++++++++
debian/patches/series | 1 +
tests/test_extensions.py | 47 +++-------
5 files changed, 117 insertions(+), 37 deletions(-)
diff --cc debian/.git-dpm
index 408d869,0000000..5abb365
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
- cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
++e0f11f76bb0907009e1bed77ab43cb6841623e9a
++e0f11f76bb0907009e1bed77ab43cb6841623e9a
+cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
+cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
+python-markdown_2.6.5.orig.tar.gz
+d94ffb2185286f2ff64e7ec8624f2de184776dba
+301781
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index cd1aaaf,0000000..2b38895
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,335 -1,0 +1,337 @@@
+python-markdown (2.6.5-2) UNRELEASED; urgency=medium
+
+ * Add python3-tidylib to build-dependencies, now that it's available.
++ * Cherry-pick upstream commit to make code highlighting tests work with
++ Pygments 2.1 (closes: #813028).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 16 Dec 2015 16:14:41 +0300
+
+python-markdown (2.6.5-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop XS-Testsuite header, not needed with recent dpkg versions.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 26 Nov 2015 18:59:49 +0300
+
+python-markdown (2.6.4-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ * Cherry-pick upstream patch to fix a regression in tables processing.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 13 Nov 2015 17:51:57 +0300
+
+python-markdown (2.6.3-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ * Update Vcs fields for git migration.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 27 Oct 2015 15:14:04 +0300
+
+python-markdown (2.6.2-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ * Bring debian/markdown_py.1 in sync with upstream help output.
+ * Add some missing information to debian/copyright.
+ * Bump python-all build-dependency to a version that introduced
+ Python 2.7.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 24 Apr 2015 12:50:39 +0300
+
+python-markdown (2.6.1-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Update package descriptions.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 09 Mar 2015 18:44:45 +0300
+
+python-markdown (2.6-1) experimental; urgency=medium
+
+ * New upstream release.
+ - No longer calls logging.captureWarnings on input (closes: #776591).
+ * Update debian/watch to point to pypi.debian.net.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 20 Feb 2015 11:00:34 +0300
+
+python-markdown (2.5.2-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop disable_wrong_tests.patch, no longer needed.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 21 Nov 2014 09:17:16 +0300
+
+python-markdown (2.5.1-2) unstable; urgency=medium
+
+ * Disable two tests that were relying on wrong assumption about Pygments
+ lexer guessing algorithm (closes: #767579).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 01 Nov 2014 12:34:55 +0300
+
+python-markdown (2.5.1-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 04 Oct 2014 10:57:08 +0400
+
+python-markdown (2.5-2) unstable; urgency=medium
+
+ * Bump X-Python-Version to 2.7 and X-Python3-Version to 3.2,
+ following upstream changes.
+ * Add python(3)-yaml and python(3)-pygments to autopkgtest
+ dependencies as well.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 15 Sep 2014 14:00:09 +0400
+
+python-markdown (2.5-1) unstable; urgency=medium
+
+ [ Andrey Rahmatullin ]
+ * Convert to pybuild.
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Simplify debian/rules.
+ * Drop upstream smarty_fixes.patch.
+ * Build-depend on and recommend python(3)-yaml.
+ * Also build-depend on python(3)-pygments.
+ * Run wrap-and-sort.
+ * Update my e-mail address.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 14 Sep 2014 11:40:01 +0400
+
+python-markdown (2.4.1-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+ * Backport upstream commits to make smarty extension work together
+ with attr_list.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 27 May 2014 12:51:34 +0400
+
+python-markdown (2.4-1) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Add explicit build-dependency on dh-python.
+
+ [ Bernd Zeimetz ]
+ * Removing myself from Uploaders.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 17 Feb 2014 15:19:36 +0400
+
+python-markdown (2.3.1-2) unstable; urgency=low
+
+ * Update man page:
+ - Correctly escape hyphens.
+ - Make DESCRIPTION section come after SYNOPSIS and remove
+ AUTHOR section.
+ * Really remove suggestion of python-utidylib, HTML Tidy extension
+ has been removed in 2.3.
+ * debian/watch: use HTTPS, and correctly escape dots.
+ * Update debian/copyright (closes: #728134, thanks Luke Faraone).
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 29 Oct 2013 20:14:29 +0400
+
+python-markdown (2.3.1-1) unstable; urgency=low
+
+ * New upstream release, with native Python 3 support.
+ * Build-depend on python-tidylib instead of python-utidylib,
+ and drop python-markdown dependency on python-utidylib.
+ * debian/rules, debian/tests: use /usr/bin/nosetests for all Python
+ versions, and make the tests output more verbose.
+ * Force buildsystem to be python_distutils.
+ * Update debian/README.Debian.
+ * Drop obsolete DM-Upload-Allowed flag.
+ * Bump Standards-Version to 3.9.4, no changes needed.
+ * Bump debhelper compat level to 9.
+ * Use canonical Vcs-Svn field.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 23 Mar 2013 14:51:20 +0400
+
+python-markdown (2.2.1-3) unstable; urgency=low
+
+ * Redirect tests stderr to stdout and don't set -x, thanks to Martin Pitt
+ (closes: #692813)
+ * Update to 2012-11-09 from upstream git
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Wed, 14 Nov 2012 09:03:07 +0400
+
+python-markdown (2.2.1-2) unstable; urgency=low
+
+ * debian/tests/control: fix wrong dependency for python3-markdown test
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 06 Nov 2012 10:48:11 +0400
+
+python-markdown (2.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Simplify .install files
+ * Add python-utidylib to python-markdown Suggests (for html_tidy extension)
+ and to Build-Depends (for testsuite)
+ * git_fix_tests.patch: dropped, no longer needed
+ * Add DEP-8 tests
+ * debian/rules: skip tests for Python versions unsupported by nose
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 05 Nov 2012 13:28:13 +0400
+
+python-markdown (2.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Recommend python[3]-pygments packages (needed for codehilite extension)
+ * Adjust to upstream documentation changes
+ * Don't compress text files that go with the documentation
+ * git_fix_inline_html.patch: dropped, applied in the new release
+ * git_fix_tests.patch: patch from upstream git to fix test suite failures
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 29 Jul 2012 14:20:06 +0400
+
+python-markdown (2.1.1-3) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Bump Standards-Version to 3.9.3
+ * Make module packages suggest the doc package
+ * Add doc-base file
+ * Run tests during build
+ * Add debian/patches/git_fix_inline_html.patch to fix issues with
+ inline html handling (closes: #646552)
+
+ [ Bernd Zeimetz ]
+ * Setting DM-Upload-Allowed: yes
+
+ -- Bernd Zeimetz <bzed at debian.org> Sat, 05 May 2012 22:31:31 +0200
+
+python-markdown (2.1.1-2) unstable; urgency=low
+
+ * Switch to debhelper 8
+ * Add python-markdown-doc package
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 16 Feb 2012 19:06:04 +0400
+
+python-markdown (2.1.1-1) unstable; urgency=low
+
+ * Add myself to Uploaders
+ * New upstream release
+ * Add debian/markdown_py.1 manpage
+ * Drop 01-fix-unusual-interpreter.patch, fixed upstream
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Wed, 25 Jan 2012 13:26:18 +0400
+
+python-markdown (2.1.0-1) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * New upstream release
+ * Use 3.0 (quilt) source format
+ * Port to dh_python*
+ * Build Python3 package (closes: #647094)
+ * debian/patches/01-fix-unusual-interpreter.patch:
+ - fix interpreter in def_list and tables extensions
+ * Bump Standards-Version to 3.9.2, no changes required
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Sun, 22 Jan 2012 15:24:30 +0400
+
+python-markdown (2.0.3-2) unstable; urgency=low
+
+ * Rename /usr/bin/markdown to /usr/bin/markdown_py for now. The Python
+ implementation is not compatible enough to be an alternative for the Perl
+ version yet. (Closes: #567378)
+ * Get rid of the new source format mess, we use the default.
+ * Add .PHONY to debian/rules.
+ * Bump Standards-Version to 3.8.4 - no changes needed.
+ * Drop XB-Python-Version, not needed.
+
+ -- Bernd Zeimetz <bzed at debian.org> Wed, 24 Feb 2010 23:24:10 +0100
+
+python-markdown (2.0.3-1) unstable; urgency=low
+
+ [ Raphaël Hertzog ]
+ * New upstream release. Closes: #525563
+ * Remove myself from Uploaders.
+ * Update watch file to point to pypi.
+ * Switch to source format "3.0 (quilt)".
+ * Fix URL in README.Debian. Closes: #532416
+ * Switch to debhelper 7 tiny rules files and compat mode 7.
+ * Build-depends on python instead of python-dev.
+ * Update Standards-Version to 3.8.3.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Wed, 27 Jan 2010 17:48:00 +0100
+
+python-markdown (1.7-2) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/rules: Don't rely on python-support directory
+ structure. Thanks Josselin Mouette. Closes: #517061.
+ * Standards-Version is 3.8.0. No changes needed.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Wed, 25 Feb 2009 23:35:20 +0100
+
+python-markdown (1.7-1) unstable; urgency=low
+
+ [ Bernd Zeimetz ]
+ * New upstream version.
+ * debian/control:
+ - Adding Homepage field, removing pseudo-field from description
+ - Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
+ - Updating my email address
+ - Bumping Standards-Version to 3.7.3 - no changes needed.
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ -- Bernd Zeimetz <bzed at debian.org> Sun, 02 Mar 2008 23:43:50 +0100
+
+python-markdown (1.6b-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Bernd Zeimetz <bernd at bzed.de> Sun, 19 Aug 2007 01:41:04 +0200
+
+python-markdown (1.6a-1) unstable; urgency=low
+
+ * New upstream version (Closes: #398856)
+ * debian/control:
+ - Added XS-Vcs-Browser, XS-Vcs-Svn field
+ - Moved python-support to Build-Depends, fixing lintian
+ error clean-should-be-satisfied-by-build-depends
+ * debian/watch:
+ - Updating watch file - upstream ships a .zip file now
+ * debian/changelog.pointer:
+ - Removing file, upstream ships a changelog now
+ * debian/README.Debian:
+ - Updated, upstream ships a changelog now
+ * debian/copyright:
+ - Reflecting upstreams change in licensing, markdown is dual-licensed
+ under GPL-2 and BSD now
+ * debian/dirs:
+ - Removing file, not needed anymore
+ * debian/compat:
+ - Bumping to level 5
+
+ -- Bernd Zeimetz <bernd at bzed.de> Sat, 18 Aug 2007 14:36:15 +0200
+
+python-markdown (1.4-2) unstable; urgency=low
+
+ * Acknowledge previous NMU. Closes: #374865
+ * Update to new python policy. Closes: #373326
+ * Updated Standards-Version.
+ * Added myself to uploaders.
+
+ -- Raphael Hertzog <hertzog at debian.org> Fri, 23 Jun 2006 10:48:53 +0200
+
+python-markdown (1.4-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Build-depend on python-dev instead of python; fixes FTBFS, patch from
+ Andreas Jochens. (Closes: #373201)
+
+ -- Steinar H. Gunderson <sesse at debian.org> Tue, 20 Jun 2006 23:53:45 +0200
+
+python-markdown (1.4-1) unstable; urgency=low
+
+ * Initial release Closes: #364082
+
+ -- Fredrik Steen <stone at debian.org> Fri, 21 Apr 2006 13:18:31 +0200
diff --cc debian/patches/0001-Make-code-highlighting-tests-work-with-Pygments-2.1.patch
index 0000000,0000000..90f39d1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-code-highlighting-tests-work-with-Pygments-2.1.patch
@@@ -1,0 -1,0 +1,100 @@@
++From e0f11f76bb0907009e1bed77ab43cb6841623e9a Mon Sep 17 00:00:00 2001
++From: Waylan Limberg <waylan.limberg at icloud.com>
++Date: Thu, 28 Jan 2016 22:09:56 -0500
++Subject: Make code highlighting tests work with Pygments 2.1
++
++Cherry-picked from upstream commit 81b724cfec03634c0bcd88b1bccb5936872d04e2.
++---
++ tests/test_extensions.py | 47 ++++++++++++-----------------------------------
++ 1 file changed, 12 insertions(+), 35 deletions(-)
++
++diff --git a/tests/test_extensions.py b/tests/test_extensions.py
++index 38f0be3..72ce212 100644
++--- a/tests/test_extensions.py
+++++ b/tests/test_extensions.py
++@@ -134,12 +134,7 @@ class TestCodeHilite(unittest.TestCase):
++ md = markdown.Markdown(
++ extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=False)])
++ if self.has_pygments:
++- self.assertEqual(
++- md.convert(text),
++- '<div class="codehilite">'
++- '<pre><span class="c"># A Code Comment</span>\n'
++- '</pre></div>'
++- )
+++ self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span'))
++ else:
++ self.assertEqual(
++ md.convert(text),
++@@ -187,12 +182,7 @@ class TestCodeHilite(unittest.TestCase):
++ extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=None)]
++ )
++ if self.has_pygments:
++- self.assertEqual(
++- md.convert(text),
++- '<div class="codehilite">'
++- '<pre><span class="c"># A Code Comment</span>\n'
++- '</pre></div>'
++- )
+++ self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span'))
++ else:
++ self.assertEqual(
++ md.convert(text),
++@@ -202,19 +192,16 @@ class TestCodeHilite(unittest.TestCase):
++
++ def testHighlightLinesWithColon(self):
++ # Test with hl_lines delimited by single or double quotes.
++- text0 = '\t:::Python hl_lines="2"\n\t#line 1\n\t#line 2\n\t#line 3'
++- text1 = "\t:::Python hl_lines='2'\n\t#line 1\n\t#line 2\n\t#line 3"
+++ text0 = '\t:::Python hl_lines="1"\n\t#line 1\n\t#line 2\n\t#line 3'
+++ text1 = "\t:::Python hl_lines='1'\n\t#line 1\n\t#line 2\n\t#line 3"
++
++ for text in (text0, text1):
++ md = markdown.Markdown(extensions=['markdown.extensions.codehilite'])
++ if self.has_pygments:
++- self.assertEqual(
++- md.convert(text),
++- '<div class="codehilite"><pre>'
++- '<span class="c">#line 1</span>\n'
++- '<span class="hll"><span class="c">#line 2</span>\n</span>'
++- '<span class="c">#line 3</span>\n'
++- '</pre></div>'
+++ self.assertTrue(
+++ md.convert(text).startswith(
+++ '<div class="codehilite"><pre><span class="hll"'
+++ )
++ )
++ else:
++ self.assertEqual(
++@@ -333,13 +320,8 @@ line 3
++ )
++
++ if self.has_pygments:
++- self.assertEqual(
++- md.convert(text),
++- '<div class="codehilite"><pre>'
++- '<span class="hll">line 1\n</span>'
++- 'line 2\n'
++- '<span class="hll">line 3\n</span>'
++- '</pre></div>'
+++ self.assertTrue(
+++ md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"')
++ )
++ else:
++ self.assertEqual(
++@@ -372,13 +354,8 @@ line 3
++ ]
++ )
++ if self.has_pygments:
++- self.assertEqual(
++- md.convert(text),
++- '<div class="codehilite"><pre>'
++- '<span class="hll"><span class="c">#line 1</span>\n</span>'
++- '<span class="c">#line 2</span>\n'
++- '<span class="hll"><span class="c">#line 3</span>\n</span>'
++- '</pre></div>'
+++ self.assertTrue(
+++ md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"')
++ )
++ else:
++ self.assertEqual(
diff --cc debian/patches/series
index 0000000,0000000..f81ddda
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Make-code-highlighting-tests-work-with-Pygments-2.1.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-markdown.git
More information about the Python-modules-commits
mailing list