[Python-modules-commits] [python-tidylib] 04/08: Merge upstream release 0.3.0
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sun Sep 25 10:58:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository python-tidylib.
commit a6b43660efb1d267b51cfe5c45e93dea6d30018a
Merge: c14393e 686af3f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sun Sep 25 13:37:30 2016 +0300
Merge upstream release 0.3.0
PKG-INFO | 18 +-
README | 20 +-
debian/.git-dpm | 6 +-
debian/changelog | 6 +
...ke-the-tests-pass-with-tidylib-5-fixes-13.patch | 4 +-
setup.py | 45 ++--
tests/test_docs.py | 34 ++-
tests/threadsafety.py | 9 +-
tidylib/__init__.py | 204 +-----------------
tidylib/tidy.py | 234 +++++++++++++++++++++
10 files changed, 318 insertions(+), 262 deletions(-)
diff --cc debian/.git-dpm
index 3dffb98,0000000..723b35b
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
- ff454c0115a676fc3dfb0dad5c98d47c78121b8d
- ff454c0115a676fc3dfb0dad5c98d47c78121b8d
- dca25b5942b5e9770f12412cff3760ac67213d7a
++686af3f015afb6de9a65d94deb0b920a91c5c1ed
++686af3f015afb6de9a65d94deb0b920a91c5c1ed
++678ef50477d8d385a9da3da4e2a327e5a8388aff
+678ef50477d8d385a9da3da4e2a327e5a8388aff
+python-tidylib_0.3.0~dfsg.orig.tar.gz
+f57c601241a6c1db70625ab2dd94d49be2e4c5a3
+10004
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 01f1e1d,0000000..a275313
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,82 -1,0 +1,88 @@@
++python-tidylib (0.3.0~dfsg-1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++
++ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Sep 2016 13:37:46 +0300
++
+python-tidylib (0.2.4~dfsg-4) unstable; urgency=medium
+
+ * Team upload.
+ * Also change python3-tidylib's dependency over to libtidy5.
+
+ -- Mattia Rizzolo <mattia at debian.org> Tue, 13 Sep 2016 21:01:30 +0000
+
+python-tidylib (0.2.4~dfsg-3) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https).
+
+ [ Jeremy Bicha ]
+ * debian/control:
+ - Build-Depend on libtidy-dev.
+ - Depend on libtidy5 instead of libtidy-0.99-0.
+ - Build-depend on texlive-generic-extra for iftex.sty. Closes: #828900
+
+ [ Dmitry Shachnev ]
+ * Make the tests pass with tidylib 5. Closes: #829178
+
+ [ Mattia Rizzolo ]
+ * Bump Standards-Version to 3.9.8, no changes needed.
+ * Bump debhelper compat level to 10.
+
+ -- Mattia Rizzolo <mattia at debian.org> Tue, 13 Sep 2016 08:34:17 +0000
+
+python-tidylib (0.2.4~dfsg-2) unstable; urgency=medium
+
+ * Team upload.
+ * Rename doc-base file to avoid file conflict with old python-tidylib
+ versions (closes: #808322).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 07 Feb 2016 21:31:24 +0300
+
+python-tidylib (0.2.4~dfsg-1) unstable; urgency=low
+
+ * Team upload, with maintainer's permission.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+ * Remove DM-Upload-Allowed; it's no longer used by the archive
+ software.
+
+ [ Janos Guljas ]
+ * Run tests during build. (Closes: #711078)
+ - Build depend on libtidy-0.99-0.
+ * Change my email address.
+ * Update copyright year in debian/copyright.
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Update debian/watch.
+ * Exclude docs/html directory from the tarball, as it contains minified JS
+ files without source.
+ * Switch to pybuild buildsystem and build a python3-tidylib package
+ (closes: #756001).
+ * Split the docs into a separate pytidylib-doc package.
+ * Use dh_sphinxdoc to symlink JavaScript files in the documentation.
+ * Prevent pytidylib.pdf from being compressed by dh_compress.
+ * Update debian/copyright.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Export PYTHONPATH when calling sphinx-build, so that autofunction
+ directive works.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 14 Dec 2015 22:00:41 +0300
+
+python-tidylib (0.2.1~dfsg-2) unstable; urgency=low
+
+ * Add libjs-underscore dependency and link to replace embeded
+ copy underscore.js file.
+ * Add DM-Upload-Allowed control field.
+
+ -- Janos Guljas <janos at resenje.org> Mon, 26 Dec 2011 22:46:46 +0100
+
+python-tidylib (0.2.1~dfsg-1) unstable; urgency=low
+
+ * Initial release. (Closes: #623016)
+
+ -- Janos Guljas <janos at resenje.org> Fri, 29 Apr 2011 00:03:51 +0200
diff --cc debian/patches/0001-Make-the-tests-pass-with-tidylib-5-fixes-13.patch
index a3e9f91,0000000..70d3bb4
mode 100644,000000..100644
--- a/debian/patches/0001-Make-the-tests-pass-with-tidylib-5-fixes-13.patch
+++ b/debian/patches/0001-Make-the-tests-pass-with-tidylib-5-fixes-13.patch
@@@ -1,68 -1,0 +1,68 @@@
- From ff454c0115a676fc3dfb0dad5c98d47c78121b8d Mon Sep 17 00:00:00 2001
++From 686af3f015afb6de9a65d94deb0b920a91c5c1ed Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Sat, 27 Aug 2016 23:48:06 +0300
+Subject: Make the tests pass with tidylib 5, fixes #13
+
+---
+ tests/test_docs.py | 8 ++++----
+ tests/test_fragments.py | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_docs.py b/tests/test_docs.py
- index 45ced58..428feea 100644
++index adcffe4..ff2379f 100644
+--- a/tests/test_docs.py
++++ b/tests/test_docs.py
+@@ -48,20 +48,20 @@ class TestDocs1(unittest.TestCase):
+
+ def test_alt_added_to_img(self):
+ h = "<img src='foo'>"
+- expected = DOC % '''<img src='foo' alt="">'''
+- doc, err = tidy_document(h)
++ expected = DOC % '''<img src='foo' alt="bar">'''
++ doc, err = tidy_document(h, {'alt-text': 'bar'})
+ self.assertEqual(doc, expected)
+
+ def test_entity_preserved_using_bytes(self):
+ h = b"é"
+ expected = (DOC % "é").encode('utf-8')
+- doc, err = tidy_document(h)
++ doc, err = tidy_document(h, {'preserve-entities': 1})
+ self.assertEqual(doc, expected)
+
+ def test_numeric_entities_using_bytes(self):
+ h = b"é"
+ expected = (DOC % "é").encode('utf-8')
+- doc, err = tidy_document(h, {'numeric-entities': 1})
++ doc, err = tidy_document(h, {'numeric-entities': 1, 'output-encoding': 'ascii'})
+ self.assertEqual(doc, expected)
+
+ def test_non_ascii_preserved(self):
+diff --git a/tests/test_fragments.py b/tests/test_fragments.py
+index dcc7a3a..c329e15 100644
+--- a/tests/test_fragments.py
++++ b/tests/test_fragments.py
+@@ -36,20 +36,20 @@ class TestFrags1(unittest.TestCase):
+
+ def test_alt_added_to_img(self):
+ h = "<img src='foo'>"
+- expected = '''<img src='foo' alt="">'''
+- doc, err = tidy_fragment(h)
++ expected = '''<img src='foo' alt="bar">'''
++ doc, err = tidy_fragment(h, {'alt-text': 'bar'})
+ self.assertEqual(doc, expected)
+
+ def test_entity_preserved_using_bytes(self):
+ h = b"é"
+ expected = b"é"
+- doc, err = tidy_fragment(h)
++ doc, err = tidy_fragment(h, {'preserve-entities': 1})
+ self.assertEqual(doc, expected)
+
+ def test_numeric_entities_using_bytes(self):
+ h = b"é"
+ expected = b"é"
+- doc, err = tidy_fragment(h, {'numeric-entities': 1})
++ doc, err = tidy_fragment(h, {'numeric-entities': 1, 'output-encoding': 'ascii'})
+ self.assertEqual(doc, expected)
+
+ def test_non_ascii_preserved(self):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-tidylib.git
More information about the Python-modules-commits
mailing list