Control: tags 812768 + patch
Control: tags 812768 + pending
Dear maintainer,
I've prepared an NMU for python-whoosh (versioned as 2.7.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
I've also pushed the changes to collab-maint git: please revert any
that you don't think are valid before the next maintainer upload.
Regards,
smcv
diffstat for python-whoosh-2.7.0 python-whoosh-2.7.0
changelog | 27 +++++
control | 8 -
missing/english-words.10.gz |binary
patches/series | 1
patches/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch | 46 ++++++++++
rules | 4
source/include-binaries | 1
7 files changed, 83 insertions(+), 4 deletions(-)
diff -Nru python-whoosh-2.7.0/debian/changelog python-whoosh-2.7.0/debian/changelog
--- python-whoosh-2.7.0/debian/changelog 2015-05-07 12:26:13.000000000 +0100
+++ python-whoosh-2.7.0/debian/changelog 2017-01-22 18:57:02.000000000 +0000
@@ -1,3 +1,30 @@
+python-whoosh (2.7.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload, incorporating changes from collab-maint git.
+
+ [ Tobias Frost ]
+ * Team upload (collab-maint)
+ * d/control:
+ - Replace VCS-* with https:// ones.
+ - d/control: Bump S-V to 3.9.8 -- no changes required
+
+ [ Simon McVittie ]
+ * Add sphinxdoc-common to Build-Depends. The sphinxdoc debhelper
+ addon is required for the 'clean' target, so installing it in
+ Build-Depends-Indep is not enough.
+ * debian/missing/english-words.10.gz: Add missing file from upstream
+ 2.7.0 tag. The unit tests require this file. (Closes: #812768)
+ - debian/source/include-binaries: Include it in the tarball.
+ - debian/rules: Copy the missing file into tests/ before building.
+ Delete it during clean.
+ * d/p/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch:
+ Add patch to make a test pass under Python 3.5. It makes outdated
+ assumptions about how Python maps Cherokee text to lower-case.
+ * debian/rules: Disable HTTP network access to avoid Sphinx contacting
+ docs.python.org (Policy §4.9)
+
+ -- Simon McVittie <[email protected]> Sun, 22 Jan 2017 18:57:02 +0000
+
python-whoosh (2.7.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru python-whoosh-2.7.0/debian/control python-whoosh-2.7.0/debian/control
--- python-whoosh-2.7.0/debian/control 2015-05-07 12:26:13.000000000 +0100
+++ python-whoosh-2.7.0/debian/control 2017-01-22 18:57:02.000000000 +0000
@@ -2,14 +2,14 @@
Section: python
Priority: optional
Maintainer: أحمد المحمودي (Ahmed El-Mahmoudy) <[email protected]>
-Build-Depends: debhelper (>= 9), dh-python, python-setuptools, python3-setuptools
+Build-Depends: debhelper (>= 9), dh-python, python-setuptools, python3-setuptools, sphinx-common
Build-Depends-Indep: python3-sphinx (>= 1.0.7+dfsg), python-all (>= 2.6.6-2), python3-all, python-pytest, python3-pytest
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://bitbucket.org/mchaput/whoosh/
X-Python-Version: >= 2.5
X-Python3-Version: >= 3.2
-Vcs-Git: git://anonscm.debian.org/collab-maint/python-whoosh.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-whoosh.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/python-whoosh.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/python-whoosh.git
Package: python-whoosh
Architecture: all
Binary files /tmp/HdzQCBlDBX/python-whoosh-2.7.0/debian/missing/english-words.10.gz and /tmp/HrvBWJW43E/python-whoosh-2.7.0/debian/missing/english-words.10.gz differ
diff -Nru python-whoosh-2.7.0/debian/patches/series python-whoosh-2.7.0/debian/patches/series
--- python-whoosh-2.7.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ python-whoosh-2.7.0/debian/patches/series 2017-01-22 18:57:02.000000000 +0000
@@ -0,0 +1 @@
+test_vector_unicode-Cope-with-updated-Python-unicode-data.patch
diff -Nru python-whoosh-2.7.0/debian/patches/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch python-whoosh-2.7.0/debian/patches/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch
--- python-whoosh-2.7.0/debian/patches/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch 1970-01-01 01:00:00.000000000 +0100
+++ python-whoosh-2.7.0/debian/patches/test_vector_unicode-Cope-with-updated-Python-unicode-data.patch 2017-01-22 18:57:02.000000000 +0000
@@ -0,0 +1,46 @@
+From: Simon McVittie <[email protected]>
+Date: Sun, 22 Jan 2017 17:48:21 +0000
+Subject: test_vector_unicode: Cope with updated Python unicode data
+
+This particular text uses Cherokee letters: for example, the first one
+used is U+13AC CHEROKEE LETTER GV.
+
+Prior to Unicode 8.0, Cherokee was modelled as not having upper or lower
+case, but this was later decided to have been incorrect. Unicode 8.0
+repurposed the existing Cherokee block U+13A0..U+13FF as upper-case
+Cherokee to reflect their appearance in existing fonts, and introduced
+new lower-case versions in the range U+AB70..U+ABBF. For example,
+U+AB7C CHEROKEE SMALL LETTER GV is the lower-case form of U+13AC.
+
+When this test was written, it was presumably run against a
+pre-Unicode 8.0 version of Python, where the default LowercaseFilter
+leaves U+13AC intact: u"\u13ac".lower() == u"\u13ac". However,
+Python 3.5 has Unicode 8.0 tables which result in
+u"\u13ac".lower() == u"\ab7c".
+
+Make the test Python-version-independent by asserting that the word
+found in the frequency analysis is the result of lower(), whatever
+this Python version thinks that is.
+
+Forwarded: https://bitbucket.org/mchaput/whoosh/issues/459/test_vector_unicode-fails-in-python-353
+---
+ tests/test_vectors.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_vectors.py b/tests/test_vectors.py
+index 11e3c0b..d15025c 100644
+--- a/tests/test_vectors.py
++++ b/tests/test_vectors.py
+@@ -77,10 +77,10 @@ def test_vector_unicode():
+ vec = list(s.vector_as("frequency", docnum, "text"))
+ assert len(vec) == 2
+
+- assert vec[0][0] == u"\u13ac\u13ad\u13ae"
++ assert vec[0][0] == u"\u13ac\u13ad\u13ae".lower()
+ assert vec[0][1] == 1
+
+- assert vec[1][0] == u"\u13af\u13b0\u13b1"
++ assert vec[1][0] == u"\u13af\u13b0\u13b1".lower()
+ assert vec[1][1] == 1
+
+
diff -Nru python-whoosh-2.7.0/debian/rules python-whoosh-2.7.0/debian/rules
--- python-whoosh-2.7.0/debian/rules 2015-05-07 12:26:13.000000000 +0100
+++ python-whoosh-2.7.0/debian/rules 2017-01-22 18:57:02.000000000 +0000
@@ -4,13 +4,17 @@
%:
dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
+override_dh_auto_build: export http_proxy=127.0.0.1:9
+override_dh_auto_build: export https_proxy=127.0.0.1:9
override_dh_auto_build:
+ cp debian/missing/english-words.10.gz tests/
dh_auto_build --buildsystem=pybuild
python3 setup.py build_sphinx
override_dh_auto_clean:
dh_auto_clean
rm -rf docs/build
+ rm -f tests/english-words.10.gz
override_dh_compress:
dh_compress -Xdoc/python-whoosh/html
diff -Nru python-whoosh-2.7.0/debian/source/include-binaries python-whoosh-2.7.0/debian/source/include-binaries
--- python-whoosh-2.7.0/debian/source/include-binaries 1970-01-01 01:00:00.000000000 +0100
+++ python-whoosh-2.7.0/debian/source/include-binaries 2017-01-22 18:57:02.000000000 +0000
@@ -0,0 +1 @@
+debian/missing/english-words.10.gz
