[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Vincent Bernat] Re: [Python-modules-team] python-axiom REMOVED from testing

Hi !

I have posted  this message in python-modules-team mailing  list but got
no answer. Looking  at the archives, it seems that  posting to this list
is pretty rare (except for BTS). So, I post this message here too.

Attachment: pgpCq1EhTmTgJ.pgp
Description: PGP signature

--- Begin Message --- 
OoO Pendant le journal télévisé du jeudi 24 janvier 2008, vers 20:56, je
disais:

>> Previous version: 0.5.26-1
>> Current version:  (not in testing)
>> Hint: <http://ftp-master.debian.org/testing/hints/he>
>> Bug #456832: python-axiom: FTBFS: exceptions.TypeError: set_progress_handler() takes exactly 2 arguments (1 given)

> This can be fixed by the following changeset:
>  http://divmod.org/trac/changeset/14739

> I attach  a diff for this change  using quilt. I have  also upgraded the
> package to  the new  0.5.27. I  have added myself  to Uploaders.  I have
> tried to commit this but I get this error:
>  svn: Commit failed (details follow):
>  svn: Authorization failed

Here  is an  updated patch  with  a manual  page for  axiomatic and  the
possibility to not run unittests on build.

Attachment: pgpHSHlTKC4Aw.pgp
Description: PGP signature

Index: debian/control
===================================================================
--- debian/control	(révision 4408)
+++ debian/control	(copie de travail)
@@ -2,13 +2,13 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Stefano Zacchiroli <zack@debian.org>, Tristan Seligmann <mithrandi@mithrandi.za.net>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4)
+Uploaders: Stefano Zacchiroli <zack@debian.org>, Tristan Seligmann <mithrandi@mithrandi.za.net>, Vincent Bernat <bernat@luffy.cx>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4), quilt, patchutils (>= 0.2.25)
 Build-Depends-Indep: python-twisted-core, python-twisted-conch, python-epsilon, python-pysqlite2
 Homepage: http://www.divmod.org/trac/wiki/DivmodAxiom
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-axiom/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-axiom/trunk/?op=log
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: python-axiom
 Architecture: all
Index: debian/TODO.Debian
===================================================================
--- debian/TODO.Debian	(révision 4408)
+++ debian/TODO.Debian	(copie de travail)
@@ -1 +0,0 @@
-- run unit tests at build time
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 4408)
+++ debian/changelog	(copie de travail)
@@ -1,9 +1,18 @@
-python-axiom (0.5.26-2) UNRELEASED; urgency=low
+python-axiom (0.5.27-1) UNRELEASED; urgency=low
 
+  [ Vincent Bernat ]
+  * New upstream release.
+  * Bump Standards-Version
+  * Fix failing unittests that were calling set_progress_handler() without
+    a second argument (Closes: #456832).
+  * Do not run unittests if nocheck is present in DEB_BUILD_OPTIONS
+  * Provide a manual page for axiomatic command
+  
+  [ Sandro Tosi ]
   * debian/control
     - uniforming Vcs-Browser field
 
- -- Sandro Tosi <matrixhasu@gmail.com>  Thu, 03 Jan 2008 11:59:15 +0100
+ -- Vincent Bernat <bernat@luffy.cx>  Thu, 24 Jan 2008 20:31:45 +0100
 
 python-axiom (0.5.26-1) unstable; urgency=low
 
Index: debian/patches/progresshandler-fix.patch
===================================================================
--- debian/patches/progresshandler-fix.patch	(révision 0)
+++ debian/patches/progresshandler-fix.patch	(révision 0)
@@ -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
Index: debian/patches/series
===================================================================
--- debian/patches/series	(révision 0)
+++ debian/patches/series	(révision 0)
@@ -0,0 +1 @@
+progresshandler-fix.patch
Index: debian/rules
===================================================================
--- debian/rules	(révision 4408)
+++ debian/rules	(copie de travail)
@@ -2,9 +2,14 @@
 DEB_PYTHON_SYSTEM = pysupport
 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/
+DEB_INSTALL_MANPAGES_python-axiom := debian/axiomatic.1
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 install/python-axiom::
 	PYTHONPATH="$(CURDIR)/$(DEB_BUILDDIR)/build/lib" /usr/bin/trial axiom
+endif
 
 binary-post-install/python-axiom::
 	rm -rf $(PKGDIR)/usr/share/python-support/python-axiom/build/
Index: debian/axiomatic.1
===================================================================
--- debian/axiomatic.1	(révision 0)
+++ debian/axiomatic.1	(révision 0)
@@ -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@luffy.cx>,
+for the Debian project (but may be used by others).

-- 
/* Fuck me gently with a chainsaw... */
        2.0.38 /usr/src/linux/arch/sparc/kernel/ptrace.c

_______________________________________________
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/python-modules-team

--- End Message ---
-- 
panic("CPU too expensive - making holiday in the ANDES!");
	2.2.16 /usr/src/linux/arch/mips/kernel/traps.c
Reply to: