[Python-modules-commits] [python-textile] 02/02: Fix path to README.textile in the tests to make them pass on our build.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Nov 9 18:02:33 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 c7178a141488849634ea74b781cb6fd8c27e0b7a
Merge: adecb42 39ca12c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Nov 9 21:00:20 2016 +0300
Fix path to README.textile in the tests to make them pass on our build.
debian/.git-dpm | 4 +--
debian/changelog | 1 +
...-to-README.textile-when-running-the-tests.patch | 40 ++++++++++++++++++++++
debian/patches/series | 1 +
tests/test_block.py | 2 +-
tests/test_cli.py | 3 +-
6 files changed, 47 insertions(+), 4 deletions(-)
diff --cc debian/.git-dpm
index f087872,0000000..ebe1b20
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
- ef1c5288e280474ff144bb1965d9777cc8af3be1
- ef1c5288e280474ff144bb1965d9777cc8af3be1
++39ca12c5b4fe280130381e8e41bed874ad720da0
++39ca12c5b4fe280130381e8e41bed874ad720da0
+d58be00ec960e3f250402f28ea47cfe756fac9f4
+d58be00ec960e3f250402f28ea47cfe756fac9f4
+python-textile_2.3.5.orig.tar.gz
+13e888a43cc50b67651d21fca43066e90437e618
+44013
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 6e7b663,0000000..dc1f9fc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,136 -1,0 +1,137 @@@
+python-textile (1:2.3.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
++ * Fix path to README.textile in the tests to make them pass on our build.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 09 Nov 2016 20:38:52 +0300
+
+python-textile (1:2.3.3-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ 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.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 29 Jul 2016 20:41:58 +0300
+
+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/0002-Fix-path-to-README.textile-when-running-the-tests.patch
index 0000000,0000000..1d06dea
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-path-to-README.textile-when-running-the-tests.patch
@@@ -1,0 -1,0 +1,40 @@@
++From 39ca12c5b4fe280130381e8e41bed874ad720da0 Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++Date: Wed, 9 Nov 2016 20:53:04 +0300
++Subject: Fix path to README.textile when running the tests
++
++Also, use sys.executable in one of the tests instead of
++hard-coded 'python'.
++---
++ tests/test_block.py | 2 +-
++ tests/test_cli.py | 3 ++-
++ 2 files changed, 3 insertions(+), 2 deletions(-)
++
++diff --git a/tests/test_block.py b/tests/test_block.py
++index 0e6dc14..a4aec1a 100644
++--- a/tests/test_block.py
+++++ b/tests/test_block.py
++@@ -56,7 +56,7 @@ def test_blockcode_extended():
++ assert result == expect
++
++ def test_blockcode_in_README():
++- with open('README.textile') as f:
+++ with open('../../../README.textile') as f:
++ readme = ''.join(f.readlines())
++ result = textile.textile(readme)
++ with open('tests/fixtures/README.txt') as f:
++diff --git a/tests/test_cli.py b/tests/test_cli.py
++index bc1e28d..e0a1234 100644
++--- a/tests/test_cli.py
+++++ b/tests/test_cli.py
++@@ -1,8 +1,9 @@
++ import six
+++import sys
++ import subprocess
++
++ def test_console_script():
++- command = ['python', '-m', 'textile', 'README.textile']
+++ command = [sys.executable, '-m', 'textile', '../../../README.textile']
++ try:
++ result = subprocess.check_output(command)
++ except AttributeError:
diff --cc debian/patches/series
index 9876484,0000000..0ba7b67
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+0001-Skip-a-test-that-requires-access-to-www.google.com.patch
++0002-Fix-path-to-README.textile-when-running-the-tests.patch
--
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