Run of fresh-snapshots for manuel

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot manuel 

Merge these changes:

git pull https://janitor.debian.net/git/manuel fresh-snapshots/main

Summary

Merged new upstream version: 1.10.1+git20190830.aeea5ce (was: 1.10.1).

Diff

diff --git a/CHANGES.rst b/CHANGES.rst
index 16044a3..bda2897 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+1.10.2 (unreleased)
+-------------------
+
+- Fix test detection in Python 2 which was broken since 1.10.0.
+  (`#20 <https://github.com/benji-york/manuel/issues/20>`_)
+
+
 1.10.1 (2018-11-15)
 -------------------
 
@@ -10,7 +17,7 @@ CHANGES
 -------------------
 
 - Fix DeprecationWarning about 'U' mode under Python 3.
-- Drop Python 2.7 and 3.3 support. Add testing and support for Python 3.6 and
+- Drop Python 2.6 and 3.3 support. Add testing and support for Python 3.6 and
   3.7.
 
 1.9.0 (2017-11-20)
diff --git a/debian/changelog b/debian/changelog
index db04af4..02bc551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-manuel (1.10.1-3) UNRELEASED; urgency=medium
+manuel (1.10.1+git20190830.aeea5ce-1) UNRELEASED; urgency=medium
 
   [ Ondřej Nový ]
   * Bump Standards-Version to 4.4.1.
@@ -7,8 +7,9 @@ manuel (1.10.1-3) UNRELEASED; urgency=medium
   * Bump debhelper from old 11 to 12.
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
+  * New upstream snapshot.
 
- -- Ondřej Nový <onovy@debian.org>  Fri, 18 Oct 2019 16:01:26 +0200
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 27 Jan 2020 05:35:50 +0000
 
 manuel (1.10.1-2) unstable; urgency=medium
 
diff --git a/debian/patches/0001-docs-no-updated-timstamp.patch b/debian/patches/0001-docs-no-updated-timstamp.patch
index 949fa55..b9a392a 100644
--- a/debian/patches/0001-docs-no-updated-timstamp.patch
+++ b/debian/patches/0001-docs-no-updated-timstamp.patch
@@ -10,10 +10,10 @@ Subject: docs-no-updated-timstamp
  sphinx/conf.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/sphinx/conf.py b/sphinx/conf.py
-index 3d07652..8501900 100644
---- a/sphinx/conf.py
-+++ b/sphinx/conf.py
+Index: manuel/sphinx/conf.py
+===================================================================
+--- manuel.orig/sphinx/conf.py
++++ manuel/sphinx/conf.py
 @@ -7,7 +7,7 @@ release = '1'
  today_fmt = '%Y-%m-%d'
  pygments_style = 'sphinx'
diff --git a/setup.py b/setup.py
index 45555dd..6fee10d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ tests_require = ['zope.testing']
 
 setup(
     name='manuel',
-    version='1.10.1',
+    version='1.10.2.dev0',
     url='http://pypi.python.org/pypi/manuel',
     packages=find_packages('src'),
     package_dir={'': 'src'},
diff --git a/src/manuel/testing.py b/src/manuel/testing.py
index fd634c4..2124e5a 100644
--- a/src/manuel/testing.py
+++ b/src/manuel/testing.py
@@ -184,7 +184,7 @@ def TestSuite(m, *paths, **kws):
             contents = fp.read()
             if not isinstance(contents, str):
                 # Python 2, we read unicode, but we really need a str
-                contents = str.encode("utf-8")
+                contents = contents.encode("utf-8")
             document = manuel.Document(
                 contents, location=abs_path)
         document.parse_with(m)

Full worker log Full build log