[Python-modules-commits] [python-textile] 04/04: Merge upstream release 2.3.3.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Jul 28 15:48:31 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 0503868f5c81d252c80dc83134266b601627c551
Merge: 351c9d5 ad29063
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Jul 28 18:46:45 2016 +0300
Merge upstream release 2.3.3.
CHANGELOG.textile | 4 ++++
debian/.git-dpm | 6 +++---
debian/changelog | 2 +-
...-Skip-a-test-that-requires-access-to-www.google.com.patch | 2 +-
tests/test_github_issues.py | 6 ++++++
textile/__init__.py | 12 ++++++++++++
textile/core.py | 5 ++++-
textile/utils.py | 10 +++++-----
textile/version.py | 2 +-
9 files changed, 37 insertions(+), 12 deletions(-)
diff --cc debian/.git-dpm
index 8271a87,0000000..1efac4b
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
- 3b9c94e03247a52a0a00821b3530552e0bd3ce79
- 3b9c94e03247a52a0a00821b3530552e0bd3ce79
- 1d5ff1880d1893e02880d4377c2207ce58dc9a9f
++ad290637d00bee1e5cf47c5046099f09832a3f7e
++ad290637d00bee1e5cf47c5046099f09832a3f7e
++f9ee586f1692057ac17a4b4777b24576aae3559d
+f9ee586f1692057ac17a4b4777b24576aae3559d
+python-textile_2.3.3.orig.tar.gz
+a73761502200b977cb0931b3b828a2e20e6557d8
+42277
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index a8de740,0000000..329283c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,128 -1,0 +1,128 @@@
- python-textile (1:2.3.2-1) UNRELEASED; urgency=medium
++python-textile (1:2.3.3-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.
+ * Build-depend on pytest, pytest-cov and pytest-runner instead of nose.
+ * Rebase the patch to disable tests that need network access.
+ * Install upstream changelog and README file as docs.
+ * Use install files to prevent installing unnecessary stuff.
+ * Update debian/copyright.
+ * Suggest html5lib, PIL and regex packages.
+ * Bump Standards-Version to 3.9.8, no changes needed.
+
+ -- 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 e181c4a,0000000..457e7a4
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,47 -1,0 +1,47 @@@
- From 3b9c94e03247a52a0a00821b3530552e0bd3ce79 Mon Sep 17 00:00:00 2001
++From ad290637d00bee1e5cf47c5046099f09832a3f7e 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.
+
+---
+ tests/test_getimagesize.py | 1 +
+ tests/test_imagesize.py | 2 ++
+ tests/test_textile.py | 1 +
+ 3 files changed, 4 insertions(+)
+
+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
+
+ PIL = pytest.importorskip('PIL')
+
++ 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/") == ''
+diff --git a/tests/test_imagesize.py b/tests/test_imagesize.py
+index 112989e..c953857 100644
+--- a/tests/test_imagesize.py
++++ b/tests/test_imagesize.py
+@@ -1,5 +1,7 @@
+ import textile
++import pytest
+
++ at pytest.mark.skip("Requires network access")
+ def test_imagesize():
+ imgurl = 'http://www.google.com/intl/en_ALL/images/srpr/logo1w.png'
+ result = textile.tools.imagesize.getimagesize(imgurl)
+diff --git a/tests/test_textile.py b/tests/test_textile.py
+index dd069fb..6d97561 100644
+--- a/tests/test_textile.py
++++ b/tests/test_textile.py
+@@ -84,6 +84,7 @@ def test_sanitize():
+ message = '{0}'.format(e)
+ assert "html5lib not available" in message
+
++ at pytest.mark.skip("Requires network access")
+ def test_imagesize():
+ PIL = pytest.importorskip('PIL')
+
--
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