[Python-modules-commits] [python-textile] 05/05: Merge upstream release 2.3.2.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jun 22 18:11:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository python-textile.
commit ca9bf86837b14a37a91b2f2d5240bf58f240e26b
Merge: c8e0403 d747d82
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jun 22 21:07:49 2016 +0300
Merge upstream release 2.3.2.
.coveragerc | 7 +
.gitignore | 22 +
.travis.yml | 25 +
CHANGELOG.textile | 42 +
CONTRIBUTORS.txt | 8 +
LICENSE.txt | 27 +
PKG-INFO | 18 -
README.textile | 46 +
TODO.textile | 6 +
debian/.git-dpm | 6 +-
debian/changelog | 3 +-
...st-that-requires-access-to-www.google.com.patch | 30 +-
pytest.ini | 3 +
requirements.txt | 2 +
setup.cfg | 18 +-
setup.py | 26 +-
tests/test_attributes.py | 15 +
tests/test_block.py | 49 +
tests/test_footnoteRef.py | 8 +
tests/test_getRefs.py | 11 +
tests/test_getimagesize.py | 10 +
tests/test_github_issues.py | 81 +
tests/test_glyphs.py | 32 +
tests/test_image.py | 21 +
tests/test_imagesize.py | 13 +
tests/test_lists.py | 7 +
tests/test_retrieve.py | 6 +
tests/test_span.py | 19 +
tests/test_subclassing.py | 17 +
tests/test_table.py | 12 +
tests/test_textile.py | 191 +++
tests/test_textilefactory.py | 28 +
tests/test_urls.py | 53 +
tests/test_utils.py | 30 +
tests/test_values.py | 322 ++++
textile.egg-info/PKG-INFO | 18 -
textile.egg-info/SOURCES.txt | 17 -
textile.egg-info/dependency_links.txt | 1 -
textile.egg-info/not-zip-safe | 1 -
textile.egg-info/requires.txt | 3 -
textile.egg-info/top_level.txt | 1 -
textile/core.py | 1783 ++++++++------------
textile/objects/__init__.py | 4 +
textile/objects/block.py | 123 ++
textile/objects/table.py | 227 +++
textile/regex_strings.py | 56 +
textile/tests/__init__.py | 608 -------
textile/textilefactory.py | 43 +-
textile/tools/doctest_utils.py | 92 -
textile/tools/imagesize.py | 12 -
textile/utils.py | 217 +++
textile/version.py | 2 +-
52 files changed, 2507 insertions(+), 1915 deletions(-)
diff --cc debian/.git-dpm
index 019823d,0000000..ffe39d7
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
- 19b43db38fcae8b47272258ef630ea8918af8bf9
- 19b43db38fcae8b47272258ef630ea8918af8bf9
- 1f8e042a0f9ef31cb7a65ada1c7298699cc8e3cd
++d747d8200710faf9e64d20c0c436cb8826c59fef
++d747d8200710faf9e64d20c0c436cb8826c59fef
++1d5ff1880d1893e02880d4377c2207ce58dc9a9f
+1d5ff1880d1893e02880d4377c2207ce58dc9a9f
+python-textile_2.3.2.orig.tar.gz
+e041b55ef352e996c9af0745de0f8fe0dd3961c7
+41941
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 0457ffa,0000000..26ef4d5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,120 -1,0 +1,121 @@@
- python-textile (1:2.2.2-2) UNRELEASED; urgency=medium
++python-textile (1:2.3.2-1) UNRELEASED; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Dmitry Shachnev ]
+ * Update debian/watch to point to GitHub, as the tarballs on PyPI no
+ longer contain tests.
++ * New upstream release.
+
+ -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 22:24:46 +0200
+
+python-textile (1:2.2.2-1) unstable; urgency=low
+
+ * Team upload, with maintainer's permission.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Jan Dittberner ]
+ * fix Homepage URL
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Switch to pybuild buildsystem and build a python3-textile package
+ (closes: #802167).
+ * Skip a test that requires network access.
+ * Update debian/copyright.
+ * Update debian/watch to use the pypi.debian.net redirector.
+ * Add html5lib to build-dependencies, for the sanitizer test.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 14 Dec 2015 18:34:21 +0300
+
+python-textile (1:2.1.5-1) unstable; urgency=low
+
+ [ Janos Guljas ]
+ * New upstream version.
+ * Remove public Python module "test" (Closes: #627539).
+ * Switch to source format 3.0 (quilt).
+ * Bump standards to 3.9.2.
+ * Update debian/copyright to DEP5 format.
+ * Change my email address to janos at resenje.org.
+ * Switch to dh_python2.
+
+ [ Jan Dittberner ]
+ * add X-Python-Version: >= 2.5
+ * depend on python (>= 2.6.6-3~) instead of python-all (>= 2.5)
+
+ -- Janos Guljas <janos at resenje.org> Fri, 27 May 2011 17:22:14 +0200
+
+python-textile (1:2.1.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated debian/patches/01_tests-in-py-modules.diff
+ * Added override_dh_auto_test in debian/rules
+ * debian/patches/01_django-test-fix.diff: Fix test failure in python-django
+
+ -- Janos Guljas <janos at janos.in.rs> Wed, 09 Dec 2009 02:02:17 +0100
+
+python-textile (1:2.1.3-1) unstable; urgency=low
+
+ * New maintainer (Closes: #540943)
+ * New upstream release.
+ * Added epoch to correct a mistake in version numbering
+ * debian/compat
+ - update debhelper compatibility to 7.
+ * debian/control
+ - removed python-central from Build-Depends-Indep.
+ - package now uses python-support and quilt.
+ - bumped Standards-Version to 3.8.3
+ - added Homepage
+ - added Vcs-Svn
+ - added Vcs-Browser
+ - added XS-Python-Version
+ - added XB-Python-Version
+ - removed recommendation of python-twisted (Closes: #514626)
+ * debian/copyright
+ - updated copyright to new upstream author
+ - added myself as a new maintainer
+ * debian/docs
+ - added README.textile
+ * Added README.source
+ * debian/rules
+ - simplified script
+ * Added debian/watch
+ * debian/patches/01_tests-in-py-modules.diff: include tests in package
+
+ -- Janos Guljas <janos at janos.in.rs> Sat, 21 Nov 2009 23:05:57 +0100
+
+python-textile (2.10-3.1.2) unstable; urgency=low
+
+ * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490501.
+
+ -- Matthias Klose <doko at debian.org> Fri, 18 Jul 2008 15:40:54 +0000
+
+python-textile (2.0.10-3.1) unstable; urgency=low
+
+ * NMU: Updated to new Python policy. (closes: #373362)
+ * Updated standards-version.
+
+ -- Luis Rodrigo Gallardo Cruz <rodrigo at nul-unu.com> Mon, 26 Jun 2006 13:23:33 -0500
+
+python-textile (2.0.10-3) unstable; urgency=low
+
+ * This package is Architecture: all, not "any"
+
+ -- Ricardo Javier Cardenes Medina <rcardenes at debian.org> Mon, 4 Apr 2005 03:23:50 +0100
+
+python-textile (2.0.10-2) unstable; urgency=low
+
+ * Fixed Build-Depends to not FTBFS (closes: Bug#288848).
+
+ -- Ricardo Javier Cardenes Medina <rcardenes at debian.org> Thu, 6 Jan 2005 17:15:35 +0000
+
+python-textile (2.0.10-1) unstable; urgency=low
+
+ * Initial Release (closes: Bug#286528).
+
+ -- Ricardo Javier Cardenes Medina <rcardenes at debian.org> Mon, 20 Dec 2004 17:10:29 +0000
+
diff --cc debian/patches/0001-Skip-a-test-that-requires-access-to-www.google.com.patch
index 0f69ef7,0000000..fafc905
mode 100644,000000..100644
--- a/debian/patches/0001-Skip-a-test-that-requires-access-to-www.google.com.patch
+++ b/debian/patches/0001-Skip-a-test-that-requires-access-to-www.google.com.patch
@@@ -1,25 -1,0 +1,21 @@@
- From 19b43db38fcae8b47272258ef630ea8918af8bf9 Mon Sep 17 00:00:00 2001
++From d747d8200710faf9e64d20c0c436cb8826c59fef Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Mon, 14 Dec 2015 19:21:41 +0300
+Subject: Skip a test that requires access to www.google.com.
+
+---
- textile/tests/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
++ tests/test_getimagesize.py | 1 +
++ 1 file changed, 1 insertion(+)
+
- diff --git a/textile/tests/__init__.py b/textile/tests/__init__.py
- index 9b2d4d9..7cf8c82 100644
- --- a/textile/tests/__init__.py
- +++ b/textile/tests/__init__.py
- @@ -482,10 +482,7 @@ class Tests():
- eq_(result, expect)
++diff --git a/tests/test_getimagesize.py b/tests/test_getimagesize.py
++index 43f85e3..8b2e1a9 100644
++--- a/tests/test_getimagesize.py
+++++ b/tests/test_getimagesize.py
++@@ -3,6 +3,7 @@ import pytest
+
- def testImageSize(self):
- - try:
- - __import__('PIL')
- - except ImportError:
- - raise SkipTest()
- + raise SkipTest("Requires network access")
++ PIL = pytest.importorskip('PIL')
+
- test = "!http://www.google.com/intl/en_ALL/images/srpr/logo1w.png!"
- result = '\t<p><img alt="" height="95" src="http://www.google.com/intl/en_ALL/images/srpr/logo1w.png" width="275" /></p>'
+++ at pytest.mark.skip(reason="Requires network access")
++ def test_imagesize():
++ assert getimagesize("http://www.google.com/intl/en_ALL/images/logo.gif") == (276, 110)
++ assert getimagesize("http://bad.domain/") == ''
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-textile.git
More information about the Python-modules-commits
mailing list