[Python-modules-commits] r9926 - in packages/python-whoosh/tags (15 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Fri Oct 2 15:38:28 UTC 2009
Date: Friday, October 2, 2009 @ 15:38:28
Author: bzed
Revision: 9926
[svn-buildpackage] Tagging python-whoosh (0.3.~0b24-1)
Added:
packages/python-whoosh/tags/0.3.~0b24-1/
packages/python-whoosh/tags/0.3.~0b24-1/debian/
packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog
(from rev 9925, packages/python-whoosh/trunk/debian/changelog)
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff
(from rev 9924, packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff)
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series
(from rev 9924, packages/python-whoosh/trunk/debian/patches/series)
packages/python-whoosh/tags/0.3.~0b24-1/debian/pyversions
(from rev 9923, packages/python-whoosh/trunk/debian/pyversions)
packages/python-whoosh/tags/0.3.~0b24-1/debian/rules
(from rev 9925, packages/python-whoosh/trunk/debian/rules)
Deleted:
packages/python-whoosh/tags/0.3.~0b24-1/debian/
packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/02-python2.4-fixes.diff
packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series
packages/python-whoosh/tags/0.3.~0b24-1/debian/rules
Deleted: packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog
===================================================================
--- packages/python-whoosh/trunk/debian/changelog 2009-10-02 15:20:45 UTC (rev 9921)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog 2009-10-02 15:38:28 UTC (rev 9926)
@@ -1,30 +0,0 @@
-python-whoosh (0.3.~0b24-1) experimental; urgency=low
-
- [ Bernd Zeimetz ]
- * New upstream release.
- * Whoosh is not compatible with 2.4 thanks to pickling problems,
- drop compat patch and limit versions in debian/pyversions.
-
- -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Fri, 02 Oct 2009 16:51:08 +0200
-
-python-whoosh (0.1.22-1) unstable; urgency=low
-
- * New upstream release.
- * Changed Maintainer to my credativ email address.
- * Refreshed debian/patches/02-python2.4-fixes.diff.
-
- -- Daniel Watkins <daniel.watkins at credativ.co.uk> Sat, 06 Jun 2009 13:38:47 +0100
-
-python-whoosh (0.1.19-2) unstable; urgency=low
-
- * Add debian/patches/01-remove-pyparsing.diff to remove the upstream copy of
- the python-pyparsing library.
- * Add python-pyparsing to Build-Depends-Indep
-
- -- Daniel Watkins <daniel at daniel-watkins.co.uk> Thu, 07 May 2009 16:44:18 +0100
-
-python-whoosh (0.1.19-1) unstable; urgency=low
-
- * Initial release. (Closes: #522934)
-
- -- Daniel Watkins <daniel at daniel-watkins.co.uk> Fri, 01 May 2009 12:27:22 +0100
Copied: packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog (from rev 9925, packages/python-whoosh/trunk/debian/changelog)
===================================================================
--- packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog (rev 0)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/changelog 2009-10-02 15:38:28 UTC (rev 9926)
@@ -0,0 +1,32 @@
+python-whoosh (0.3.~0b24-1) experimental; urgency=low
+
+ [ Bernd Zeimetz ]
+ * New upstream release.
+ * Whoosh is not compatible with 2.4 thanks to pickling problems,
+ drop compat patch and limit versions in debian/pyversions.
+ * Update watch file.
+ * Disable test for now as they're broken/not existant.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Fri, 02 Oct 2009 16:51:08 +0200
+
+python-whoosh (0.1.22-1) unstable; urgency=low
+
+ * New upstream release.
+ * Changed Maintainer to my credativ email address.
+ * Refreshed debian/patches/02-python2.4-fixes.diff.
+
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk> Sat, 06 Jun 2009 13:38:47 +0100
+
+python-whoosh (0.1.19-2) unstable; urgency=low
+
+ * Add debian/patches/01-remove-pyparsing.diff to remove the upstream copy of
+ the python-pyparsing library.
+ * Add python-pyparsing to Build-Depends-Indep
+
+ -- Daniel Watkins <daniel at daniel-watkins.co.uk> Thu, 07 May 2009 16:44:18 +0100
+
+python-whoosh (0.1.19-1) unstable; urgency=low
+
+ * Initial release. (Closes: #522934)
+
+ -- Daniel Watkins <daniel at daniel-watkins.co.uk> Fri, 01 May 2009 12:27:22 +0100
Deleted: packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff 2009-09-16 14:27:29 UTC (rev 9784)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff 2009-10-02 15:38:28 UTC (rev 9926)
@@ -1,22 +0,0 @@
-## 01-remove-pyparsing.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## Debian ships the pyparsing module in the python-pyparsing package,
-## so we remove the unnecessary copy here, and fix references to it
-## that we break.
-
-Index: python-whoosh-0.1.19/src/whoosh/qparser.py
-===================================================================
---- python-whoosh-0.1.19.orig/src/whoosh/qparser.py 2009-04-30 04:08:28.000000000 +0100
-+++ python-whoosh-0.1.19/src/whoosh/qparser.py 2009-05-07 16:56:25.000000000 +0100
-@@ -1,8 +1,8 @@
- import re
-
--from whoosh.support.pyparsing import alphanums, printables, \
--CharsNotIn, Literal, Group, Combine, Suppress, Regex, OneOrMore, Forward, Word, Keyword, \
--Empty, StringEnd, ParserElement
-+from pyparsing import alphanums, printables, CharsNotIn, Literal, Group, \
-+ Combine, Suppress, Regex, OneOrMore, Forward, Word, Keyword, Empty, \
-+ StringEnd, ParserElement
- from whoosh import analysis, query
-
- """
Copied: packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff (from rev 9924, packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff)
===================================================================
--- packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff (rev 0)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/01-remove-pyparsing.diff 2009-10-02 15:38:28 UTC (rev 9926)
@@ -0,0 +1,32 @@
+## 01-remove-pyparsing.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## Debian ships the pyparsing module in the python-pyparsing package,
+## so we remove the unnecessary copy here, and fix references to it
+## that we break.
+
+--- a/src/whoosh/qparser.py
++++ b/src/whoosh/qparser.py
+@@ -56,17 +56,16 @@ http://pyparsing.wikispaces.com/space/sh
+
+ import re
+
+-from whoosh.support.pyparsing import printables, alphanums
+-from whoosh.support.pyparsing import ZeroOrMore, OneOrMore
+-from whoosh.support.pyparsing import Group, Combine, Suppress, Optional, FollowedBy
+-from whoosh.support.pyparsing import Literal, CharsNotIn, Word, Keyword
+-from whoosh.support.pyparsing import Empty, White, Forward, QuotedString
+-from whoosh.support.pyparsing import StringEnd, ParserElement
++from pyparsing import printables, alphanums
++from pyparsing import ZeroOrMore, OneOrMore
++from pyparsing import Group, Combine, Suppress, Optional, FollowedBy
++from pyparsing import Literal, CharsNotIn, Word, Keyword
++from pyparsing import Empty, White, Forward, QuotedString
++from pyparsing import StringEnd, ParserElement
+
+ from whoosh.analysis import NgramAnalyzer
+ from whoosh.query import *
+
+-
+ def _make_default_parser():
+ escapechar = "\\"
+
Deleted: packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/02-python2.4-fixes.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff 2009-09-16 14:27:29 UTC (rev 9784)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/02-python2.4-fixes.diff 2009-10-02 15:38:28 UTC (rev 9926)
@@ -1,267 +0,0 @@
-## 01-python2.4-fixes.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## Fix uses of Python 2.5 idioms so this package will work with Python 2.4.
-
-Index: python-whoosh-0.1.20/src/whoosh/query.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/query.py 2009-04-27 03:30:53.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/query.py 2009-05-27 16:15:42.000000000 +0100
-@@ -24,10 +24,10 @@
- from __future__ import division
- from array import array
- from bisect import bisect_left, bisect_right
--from collections import defaultdict
- import fnmatch, re
-
- from whoosh.support.bitvector import BitVector
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.lang.morph_en import variations
-
- # Utility functions
-Index: python-whoosh-0.1.20/src/whoosh/support/bitvector.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/support/bitvector.py 2009-03-18 06:04:40.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/bitvector.py 2009-05-27 16:15:42.000000000 +0100
-@@ -53,8 +53,13 @@
-
- def __str__(self):
- get = self.__getitem__
-- return "".join("1" if get(i) else "0"
-- for i in xrange(0, self.size))
-+ x = []
-+ for i in xrange(0, self.size):
-+ if get(i):
-+ x.append("1")
-+ else:
-+ x.append("0")
-+ return "".join(x)
-
- def __getitem__(self, index):
- return self.bits[index >> 3] & (1 << (index & 7)) != 0
-@@ -127,4 +132,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: python-whoosh-0.1.20/src/whoosh/lang/morph_en.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/lang/morph_en.py 2009-03-18 06:04:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/lang/morph_en.py 2009-05-27 16:15:42.000000000 +0100
-@@ -900,7 +900,10 @@
- # positional groups are None)
- groups = [g for g in match.groups() if g is not None]
- ending = groups[-1]
-- root = word[:0-len(ending)] if ending else word
-+ if ending:
-+ root = word[:0-len(ending)]
-+ else:
-+ root = word
-
- out = set((word, ))
- results = rules[i * _partition_size + num][1]
-Index: python-whoosh-0.1.20/src/whoosh/classify.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/classify.py 2009-03-21 04:27:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/classify.py 2009-05-27 16:15:42.000000000 +0100
-@@ -17,10 +17,11 @@
- """Classes and functions for classifying and extracting information from documents.
- """
-
--from __future__ import division, with_statement
--from collections import defaultdict
-+from __future__ import division
- from math import log
-
-+from whoosh.support.defaultdict import defaultdict
-+
-
- # Expansion models
-
-Index: python-whoosh-0.1.20/src/whoosh/fields.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/fields.py 2009-05-25 21:22:37.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/fields.py 2009-05-27 16:16:43.000000000 +0100
-@@ -21,9 +21,9 @@
- """
-
- import re
--from collections import defaultdict
-
- from whoosh.analysis import unstopped, IDAnalyzer, RegexAnalyzer, KeywordAnalyzer, StandardAnalyzer, NgramAnalyzer
-+from whoosh.support.defaultdict import defaultdict
-
- # Exceptions
-
-@@ -32,6 +32,11 @@
- class UnknownFieldError(Exception):
- pass
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
- # Field Types
-
- class FieldType(object):
-Index: python-whoosh-0.1.20/src/whoosh/support/defaultdict.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/defaultdict.py 2009-05-27 16:15:42.000000000 +0100
-@@ -0,0 +1,37 @@
-+try:
-+ from collections import defaultdict
-+except:
-+ class defaultdict(dict):
-+ def __init__(self, default_factory=None, *a, **kw):
-+ if (default_factory is not None and
-+ not hasattr(default_factory, '__call__')):
-+ raise TypeError('first argument must be callable')
-+ dict.__init__(self, *a, **kw)
-+ self.default_factory = default_factory
-+ def __getitem__(self, key):
-+ try:
-+ return dict.__getitem__(self, key)
-+ except KeyError:
-+ return self.__missing__(key)
-+ def __missing__(self, key):
-+ if self.default_factory is None:
-+ raise KeyError(key)
-+ self[key] = value = self.default_factory()
-+ return value
-+ def __reduce__(self):
-+ if self.default_factory is None:
-+ args = tuple()
-+ else:
-+ args = self.default_factory,
-+ return type(self), args, None, None, self.items()
-+ def copy(self):
-+ return self.__copy__()
-+ def __copy__(self):
-+ return type(self)(self.default_factory, self)
-+ def __deepcopy__(self, memo):
-+ import copy
-+ return type(self)(self.default_factory,
-+ copy.deepcopy(self.items()))
-+ def __repr__(self):
-+ return 'defaultdict(%s, %s)' % (self.default_factory,
-+ dict.__repr__(self))
-Index: python-whoosh-0.1.20/src/whoosh/writing.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/writing.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/writing.py 2009-05-27 16:15:42.000000000 +0100
-@@ -19,11 +19,11 @@
- """
-
- from array import array
--from collections import defaultdict
- from tempfile import TemporaryFile
-
- from whoosh import index, postpool, reading, structfile, tables
- from whoosh.fields import UnknownFieldError
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.util import fib
-
- # Exceptions
-Index: python-whoosh-0.1.20/src/whoosh/util.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/util.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/util.py 2009-05-27 16:15:42.000000000 +0100
-@@ -18,7 +18,6 @@
- Miscellaneous utility functions and classes.
- """
-
--from functools import wraps
- from heapq import heappush, heapreplace
-
- from whoosh.support.bitvector import BitVector
-@@ -172,7 +171,6 @@
- have 'is_closed' and '_sync_lock' attributes.
- """
-
-- @wraps(func)
- def wrapper(self, *args, **kwargs):
- if self.is_closed:
- raise Exception("This object has been closed")
-Index: python-whoosh-0.1.20/src/whoosh/spelling.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/spelling.py 2009-03-21 04:27:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/spelling.py 2009-05-27 16:15:42.000000000 +0100
-@@ -18,9 +18,8 @@
- as a backend for a spell-checking engine.
- """
-
--from collections import defaultdict
--
- from whoosh import analysis, fields, query, searching, writing
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.support.levenshtein import relative, distance
-
- class SpellChecker(object):
-Index: python-whoosh-0.1.20/src/whoosh/highlight.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/highlight.py 2009-03-18 06:04:40.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/highlight.py 2009-05-27 16:15:42.000000000 +0100
-@@ -17,6 +17,11 @@
- from __future__ import division
- from heapq import nlargest
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
-
- # Fragment object
-
-Index: python-whoosh-0.1.20/src/whoosh/index.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/index.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/index.py 2009-05-27 16:15:42.000000000 +0100
-@@ -28,6 +28,11 @@
-
- from whoosh import fields, store
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
-
- _DEF_INDEX_NAME = "MAIN"
- _EXTENSIONS = "dci|dcz|tiz|fvz"
-Index: python-whoosh-0.1.20/src/whoosh/reading.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/reading.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/reading.py 2009-05-27 16:15:42.000000000 +0100
-@@ -25,6 +25,11 @@
- from whoosh.util import ClosableMixin, protected
- from whoosh.fields import FieldConfigurationError, UnknownFieldError
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
- # Exceptions
-
- class TermNotFound(Exception):
-@@ -641,4 +646,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: python-whoosh-0.1.20/src/whoosh/support/any.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/any.py 2009-05-27 16:15:42.000000000 +0100
-@@ -0,0 +1,5 @@
-+def any(iterable):
-+ for element in iterable:
-+ if element:
-+ return True
-+ return False
Deleted: packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series
===================================================================
--- packages/python-whoosh/trunk/debian/patches/series 2009-09-16 14:27:29 UTC (rev 9784)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series 2009-10-02 15:38:28 UTC (rev 9926)
@@ -1,2 +0,0 @@
-01-remove-pyparsing.diff
-02-python2.4-fixes.diff
Copied: packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series (from rev 9924, packages/python-whoosh/trunk/debian/patches/series)
===================================================================
--- packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series (rev 0)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/patches/series 2009-10-02 15:38:28 UTC (rev 9926)
@@ -0,0 +1 @@
+01-remove-pyparsing.diff
Copied: packages/python-whoosh/tags/0.3.~0b24-1/debian/pyversions (from rev 9923, packages/python-whoosh/trunk/debian/pyversions)
===================================================================
--- packages/python-whoosh/tags/0.3.~0b24-1/debian/pyversions (rev 0)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/pyversions 2009-10-02 15:38:28 UTC (rev 9926)
@@ -0,0 +1 @@
+2.5-
Deleted: packages/python-whoosh/tags/0.3.~0b24-1/debian/rules
===================================================================
--- packages/python-whoosh/trunk/debian/rules 2009-10-02 15:20:45 UTC (rev 9921)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/rules 2009-10-02 15:38:28 UTC (rev 9926)
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/python/python.mk
-include /usr/share/quilt/quilt.make
-
-clean: unpatch
- dh $@
-
-build: patch
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- python setup.py test
-endif
- dh $@
-
-install: build
- dh $@ --before dh_pysupport
- rm -f debian/python-whoosh$(call py_libdir,$(shell pyversions -vd))/whoosh/support/pyparsing.py
- dh $@ --remaining
-
-binary-indep: install
- dh $@
-
-binary-arch:
-
-binary: binary-arch binary-indep
- dh $@
Copied: packages/python-whoosh/tags/0.3.~0b24-1/debian/rules (from rev 9925, packages/python-whoosh/trunk/debian/rules)
===================================================================
--- packages/python-whoosh/tags/0.3.~0b24-1/debian/rules (rev 0)
+++ packages/python-whoosh/tags/0.3.~0b24-1/debian/rules 2009-10-02 15:38:28 UTC (rev 9926)
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+include /usr/share/python/python.mk
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
+ dh $@
+
+build: patch
+#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# python setup.py test
+#endif
+ dh $@
+
+install: build
+ dh $@ --before dh_pysupport
+ rm -f debian/python-whoosh$(call py_libdir,$(shell pyversions -vd))/whoosh/support/pyparsing.py
+ dh $@ --remaining
+
+binary-indep: install
+ dh $@
+
+binary-arch:
+
+binary: binary-arch binary-indep
+ dh $@
More information about the Python-modules-commits
mailing list