[Python-modules-commits] r4423 - in packages/python-axiom/trunk/debian (5 files)

Sat Jan 26 12:15:13 UTC 2008

Date: Saturday, January 26, 2008 @ 12:15:12
  Author: mithrandi-guest
Revision: 4423

Add progress handler fix and axiomatic man page.

Added:
  packages/python-axiom/trunk/debian/axiomatic.1
  packages/python-axiom/trunk/debian/patches/
  packages/python-axiom/trunk/debian/patches/progresshandler-fix.patch
  packages/python-axiom/trunk/debian/patches/series
Modified:
  packages/python-axiom/trunk/debian/rules

Added: packages/python-axiom/trunk/debian/axiomatic.1
===================================================================

--- packages/python-axiom/trunk/debian/axiomatic.1	                        (rev 0)
+++ packages/python-axiom/trunk/debian/axiomatic.1	2008-01-26 12:15:12 UTC (rev 4423)
@@ -0,0 +1,75 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH AXIOMATIC 1 "24 January 2008"
+.SH NAME
+axiomatic \- command-line tool for creating, configuring, and inspecting an axiom database
+.SH SYNOPSIS
+.B axiomatic
+.RI [ options ]
+.RI [ command ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B axiomatic
+command.
+.PP
+\fBaxiomatic\fP allows to create, configure and interact with an axiom
+database. The most commonly used subcommands are
+.B start
+, 
+.B stop
+and
+.B status.
+.br
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-b, \-\-debug
+Enable Axiom-level debug logging.
+.TP
+.B \-d, \-\-dbdir=
+Path containing axiom database to configure/create.
+.TP
+.B \-\-version
+Show version of program.
+.TP
+.B \-\-help
+Display help.
+.SH COMMANDS
+Except when using \-\-version and \-\-help, you need to specify one
+command. The possible commands are included below.
+.TP
+.B start
+Launch the given Axiom database.
+.TP
+.B stop
+Stop the server running from the given Axiom database.
+.TP
+.B status
+Report whether a server is running from the given Axiom database.
+.TP
+.B insert\-user
+Insert a user store, such as one extracted with 
+.B extract-user,
+into a site store and login system.
+.TP
+.B userbase
+LoginSystem introspection and manipulation.
+.TP
+.B extract-user
+Remove an account from the login system, moving its associated
+database to the filesystem.
+.TP
+.B browse
+Interact with an Axiom store.
+.SH SEE ALSO
+Axiom homepage: http://divmod.org/trac/wiki/DivmodAxiom
+.SH AUTHOR
+axiomatic is part of Axiom, an object database, or alternatively, an
+object-relational mapper written by Divmod.
+.PP
+This manual page was written by Vincent Bernat <bernat at luffy.cx>,
+for the Debian project (but may be used by others).

Added: packages/python-axiom/trunk/debian/patches/progresshandler-fix.patch
===================================================================
--- packages/python-axiom/trunk/debian/patches/progresshandler-fix.patch	                        (rev 0)
+++ packages/python-axiom/trunk/debian/patches/progresshandler-fix.patch	2008-01-26 12:15:12 UTC (rev 4423)
@@ -0,0 +1,90 @@
+This patch is stolen from changeset 14739:
+ http://divmod.org/trac/changeset/14739
+See bug #2468:
+ http://divmod.org/trac/ticket/2468
+It fixes the Debian bug #456832
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456832
+
+Index: Axiom/axiom/test/util.py
+===================================================================
+--- Axiom/axiom/test/util.py (revision 10861)
++++ Axiom/axiom/test/util.py (revision 14739)
+@@ -98,9 +98,8 @@
+         if sph is None:
+             raise SkipTest(
+-                "Your version of PySQLite does not expose the "
+-                "set_progress_handler API.  A patch which does so "
+-                "is available from "
+-                "http://initd.org/tracker/pysqlite/ticket/182")
+-        sph(self.progressHandler)
++                "QueryCounter requires PySQLite 2.4 or newer, or a patch "
++                "(see <http://initd.org/tracker/pysqlite/ticket/182>) to "
++                "expose the set_progress_handler API.")
++        sph(self.progressHandler, 1)
+ 
+     def progressHandler(self):
+Index: Axiom/axiom/test/test_query.py
+===================================================================
+--- Axiom/axiom/test/test_query.py (revision 13104)
++++ Axiom/axiom/test/test_query.py (revision 14739)
+@@ -7,4 +7,5 @@
+ from axiom.store import Store, ItemQuery
+ from axiom.item import Item, Placeholder
++from axiom.test.util import QueryCounter
+ 
+ from axiom import errors
+@@ -1013,20 +1014,4 @@
+         self.store = Store()
+         self.query = self.store.query(FirstType, self.comparison)
+-        class counter:
+-            count = 0
+-            def increment(self):
+-                self.count += 1
+-                return 0
+-        self.counter = counter()
+-
+-        store = self.store
+-        connection = store.connection
+-        _connection = connection._connection
+-        try:
+-            self.setProgressHandler = _connection.set_progress_handler
+-        except AttributeError:
+-            raise SkipTest(
+-                "Axiom missing setProgressHandler, cannot run bytecode "
+-                "execution-counting tests.")
+ 
+         # Make one of each to get any initialization taken care of so it
+@@ -1035,12 +1020,4 @@
+         SecondType(store=self.store)
+ 
+-        self.setProgressHandler(self.counter.increment)
+-
+-
+-    def _countQuery(self):
+-        for i in range(10):
+-            self.counter.count = 0
+-            list(self.query)
+-            yield self.counter.count
+ 
+     def test_firstTableOuterLoop(self):
+@@ -1053,7 +1030,8 @@
+         number of bytecodes executed increased.
+         """
++        counter = QueryCounter(self.store)
+         counts = []
+-        for c in self._countQuery():
+-            counts.append(c)
++        for c in range(10):
++            counts.append(counter.measure(list, self.query))
+             FirstType(store=self.store)
+ 
+@@ -1075,6 +1053,8 @@
+         never examined.
+         """
++        counter = QueryCounter(self.store)
+         count = None
+-        for c in self._countQuery():
++        for i in range(10):
++            c = counter.measure(list, self.query)
+             if count is None:
+                 count = c

Added: packages/python-axiom/trunk/debian/patches/series
===================================================================
--- packages/python-axiom/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-axiom/trunk/debian/patches/series	2008-01-26 12:15:12 UTC (rev 4423)
@@ -0,0 +1 @@
+progresshandler-fix.patch

Modified: packages/python-axiom/trunk/debian/rules
===================================================================
--- packages/python-axiom/trunk/debian/rules	2008-01-26 11:37:22 UTC (rev 4422)
+++ packages/python-axiom/trunk/debian/rules	2008-01-26 12:15:12 UTC (rev 4423)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 DEB_PYTHON_SYSTEM = pysupport
+DEB_INSTALL_MANPAGES_python-axiom := debian/axiomatic.1
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 PKGDIR=debian/python-axiom/
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))


