Commit bc1dfb83 authored by Chris Lamb's avatar Chris Lamb Committed by Sebastian Ramacher

Imported Debian patch 0.9.0-4

parent f4c09697
codespeak-lib (0.9.0-4) unstable; urgency=low
* Add myself to Uploaders:
* Use Homepage: field in debian/control.
* Bump Standards-Version to 3.7.3.
* Add openssh-client to Build-depends. (Closes: #419969)
* Re-add missing documentation (broken by NMU) and rework how
documentation is generated. (Closes: #441698)
-- Chris Lamb <chris@chris-lamb.co.uk> Mon, 04 Feb 2008 16:15:21 +0000
codespeak-lib (0.9.0-3.1) unstable; urgency=low
* Non-maintainer upload.
......
......@@ -2,10 +2,11 @@ Source: codespeak-lib
Section: python
Priority: optional
Maintainer: Guilherme Salgado <salgado@async.com.br>
Uploaders: Alexandre Fayolle <afayolle@debian.org>
Build-Depends: python-all-dev (>= 2.3.5-10), python-central (>= 0.5), debhelper (>= 5.0.37.1), dpatch, python-docutils, xsltproc, docbook-xsl, subversion
Uploaders: Alexandre Fayolle <afayolle@debian.org>, Chris Lamb <chris@chris-lamb.co.uk>
Build-Depends: python-all-dev (>= 2.3.5-10), python-central (>= 0.5), debhelper (>= 5.0.37.1), dpatch, python-docutils, xsltproc, docbook-xsl, subversion, openssh-client
XS-Python-Version: all
Standards-Version: 3.7.2
Standards-Version: 3.7.3
Homepage: http://codespeak.net/py/
Package: python-codespeak-lib
Architecture: any
......@@ -13,13 +14,18 @@ Depends: ${python:Depends}, ${shlibs:Depends}
Conflicts: python-pylib, python2.3-codespeak-lib, python2.4-codespeak-lib
Replaces: python-pylib, python2.3-codespeak-lib, python2.4-codespeak-lib
Recommends: python-tkinter, python-docutils
Suggests: screen, rsync, graphviz, tetex-bin, gs-gpl|gs-esp, ps2eps, subversion
Suggests: screen, rsync, graphviz, tetex-bin, gs-gpl|gs-esp, ps2eps, subversion
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: The pylib library containing py.test, greenlets and other niceties
It includes py.test, whose focus is to get a test environment that's easier
to use than the existing ones, py.xml ("a fast'n'easy way to generate
xml/html documents"), py.magic.greenlet ("Lightweight in-process concurrent
programming") and many more features.
The Codespeak py lib aims at supporting a decent Python development process
addressing deployment, versioning, testing and documentation perspectives. It
includes:
.
homepage: http://codespeak.net/py/
* py.test, whose focus is to get a test environment that's easier to use than
the existing ones
* py.xml, a fast and easy way to generate xml/html documents
* py.magic.greenlet, lightweight in-process concurrent programming
* py.execnet, ad-hoc code distribution to SSH, Socket and local sub-processes
* py.path, path abstractions over local and subversion files
* .. and many more features.
This package was debianized by Guilherme Salgado <salgado@async.com.br> on
Sat, 23 Jul 2005 10:48:20 -0300.
It was downloaded from http://codespeak.net/
It was downloaded from <http://codespeak.net/>.
Copyright:
Upstream Authors: Holger Krekel (hpk at trillke net)
Jens-Uwe Mager (jum at anubis han de)
Philipp von Weitershausen (philipp at weitershausen de)
Upstream Authors:
Holger Krekel <hpk@trillke.net>
Jens-Uwe Mager <jum@anubis.han.de>
Philipp von Weitershausen <philipp@weitershausen.de>
License:
py lib Copyright holders, 2003-2005
-----------------------------------
Except when otherwise stated (look for LICENSE files or information at
the beginning of each file) the files in the 'py' directory are
copyrighted by one or more of the following people and organizations:
Holger Krekel <hpk@trillke.net>
merlinux GmbH, Germany <office@merlinux.de>
Armin Rigo <arigo@tunes.org>
Jan Balster <jan@balster.info> (tkinter test backend)
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Copyright (C) py lib Copyright holders, 2003-2005
Except when otherwise stated (look for LICENSE files or information at
the beginning of each file) the files in the 'py' directory are
copyrighted by one or more of the following people and organizations:
Holger Krekel <hpk@trillke.net>
merlinux GmbH, Germany <office@merlinux.de>
Armin Rigo <arigo@tunes.org>
Jan Balster <jan@balster.info> (tkinter test backend)
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
python-codespeak-lib: script-not-executable ./usr/share/pycentral/python-codespeak-lib/site-packages/py/execnet/script/shell.py
python-codespeak-lib: script-not-executable ./usr/share/pycentral/python-codespeak-lib/site-packages/py/execnet/script/socketserver.py
python-codespeak-lib: script-not-executable ./usr/share/pycentral/python-codespeak-lib/site-packages/py/misc/findmissingdocstrings.py
01-fix-scripts
02-fix-greenlet-bustage
03-distutils-setup
04-apigen
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-scripts.dpatch by <alf@merlin>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: findpy not available in /usr/bin + use /usr/bin/python
@DPATCH@
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01-fix-greenlet-bustage.dpatch by <salgado@canario.async.com.br>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
--- codespeak-lib-0.7.orig/py/magic/greenlet.py
+++ codespeak-lib-0.7/py/magic/greenlet.py
@@ -6,5 +6,5 @@
# regular CPython (or pypy without stackless support, and then crash :-)
import py
gdir = py.path.local(py.__file__).dirpath()
- path = gdir.join('c-extension', 'greenlet', 'greenlet.c')
- greenlet = path._getpymodule().greenlet
+ path = gdir.join('c-extension', 'greenlet', 'greenlet.so')
+ greenlet = path.pyimport().greenlet
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03-distutils-setup.dpatch by <alf@merlin>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use stdlib's distutils for setup
@DPATCH@
......@@ -60,4 +59,4 @@
+setup(packages = packages,
+ scripts = scripts,
+ package_data = package_data
+ )
+ )
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04-apigen.dpatch
@DPATCH@
--- codespeak-lib-0.9.0.orig/py/apigen/htmlgen.py
+++ codespeak-lib-0.9.0/py/apigen/htmlgen.py
@@ -178,6 +178,8 @@
rev = None
if wc.check(versioned=True):
rev = py.path.svnwc(packageroot).info().rev
+ else:
+ rev = py.__package__.revision
_revcache[packageroot] = rev
if packageroot.basename == "py":
assert rev is not None
--- codespeak-lib-0.9.0.orig/py/apigen/tracer/docstorage.py
+++ codespeak-lib-0.9.0/py/apigen/tracer/docstorage.py
@@ -21,8 +21,17 @@
for key, value in defs.iteritems():
chain = key.split('.')
base = module
- for elem in chain:
- base = getattr(base, elem)
+ try:
+ for elem in chain:
+ base = getattr(base, elem)
+ except RuntimeError, exc:
+ if elem == "greenlet":
+ print exc.__class__.__name__, exc
+ print "Greenlets not supported on this platform. Skipping apigen doc for this module"
+ continue
+ else:
+ raise
+
if value[1] == '*':
d.update(get_star_import_tree(base, key))
else:
--- codespeak-lib-0.9.0.orig/py/bin/_docgen.py 2007-02-14 11:13:06.000000000 +0000
+++ codespeak-lib-0.9.0/py/bin/_docgen.py 2008-02-05 11:09:29.000000000 +0000
@@ -28,7 +28,7 @@
def build_docs(targetpath, testargs):
docpath = pypath.join('doc')
run_tests(docpath, '',
- testargs + ' --forcegen --apigenrelpath="apigen/"')
+ testargs + ' --forcegen --apigen="%s/apigen/apigen.py"' % (pypath,))
docpath.copy(targetpath)
......@@ -17,7 +17,7 @@ XP=xsltproc -''-nonet
manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
......@@ -86,8 +86,8 @@ and docbook-xsl in your Build-Depends control field.
because the original program does not have a manual page.
Instead, it has documentation in html available in /usr/share/doc/python-codespeak-lib/.</para>
<para><command>&dhpackage;</command> is a program that recursivly delete .pyc files
from the given directories. Specify '.' as an argument to disable recursion.
<para><command>&dhpackage;</command> is a program that recursivly delete .pyc files
from the given directories. Specify '.' as an argument to disable recursion.
</para>
</refsect1>
......@@ -97,13 +97,13 @@ and docbook-xsl in your Build-Depends control field.
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
......
......@@ -17,7 +17,7 @@ XP=xsltproc -''-nonet
manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
......@@ -86,7 +86,7 @@ and docbook-xsl in your Build-Depends control field.
because the original program does not have a manual page.
Instead, it has documentation in html available in /usr/share/doc/python-codespeak-lib/.</para>
<para><command>&dhpackage;</command> is a program that computes number of non-empty lines of
<para><command>&dhpackage;</command> is a program that computes number of non-empty lines of
code in python modules. If one or more directories are given, python modules will be found
recursivly. Test files and normal ones are identified and reported separately.
......@@ -100,12 +100,12 @@ and docbook-xsl in your Build-Depends control field.
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
......
......@@ -17,7 +17,7 @@ XP=xsltproc -''-nonet
manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
......@@ -131,13 +131,13 @@ and docbook-xsl in your Build-Depends control field.
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
......
......@@ -17,7 +17,7 @@ XP=xsltproc -''-nonet
manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
......@@ -137,13 +137,13 @@ and docbook-xsl in your Build-Depends control field.
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
<para>
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL.
</para>
</refsect1>
</refentry>
......
......@@ -19,7 +19,7 @@ patch-stamp:
dpatch apply-all
touch $@
build: build-doc patch build-stamp
build: patch build-stamp build-doc
build-doc: build-doc-stamp $(MANPAGES)
ls $(MANPAGES) > debian/python-codespeak-lib.manpages
......@@ -28,9 +28,11 @@ build-doc: build-doc-stamp $(MANPAGES)
$(XP) -o $@ $(DB2MAN) $<
build-doc-stamp:
#./py/bin/py.test --apigen=py/apigen/apigen.py py || true
mkdir apigen
echo "** This takes a long time, please be patient **"
./py/bin/_docgen.py apigen || true
echo "py/doc/* usr/share/doc/python-codespeak-lib/py/doc" >> debian/python-codespeak-lib.install
#echo "apigen usr/share/doc/python-codespeak-lib/" >> debian/python-codespeak-lib.install
echo "apigen usr/share/doc/python-codespeak-lib/" >> debian/python-codespeak-lib.install
touch $@
build-stamp: $(PYVERS:%=build-python%)
......@@ -76,11 +78,10 @@ clean: unpatch
py/c-extension/greenlet/build \
apigen
find . -name "*.pyc" -exec rm -f {} \;
find py/doc/ -name "*.html" -exec rm -f {} \;
find . -name "*.pyc" | xargs rm -f
find py/doc/ -name "*.html" | xargs rm -f
dh_clean
install: build
dh_testdir
dh_testroot
......@@ -100,7 +101,7 @@ binary-arch: build install
dh_installchangelogs -a
dh_installdocs -a
dh_installman -a
find debian/python-codespeak-lib -name .svn -exec rm -rf {} \; || true
find debian/python-codespeak-lib -name .svn | xargs rm -rf {}
dh_installexamples -a
dh_strip -a
dh_compress -a -X.py
......
......@@ -178,8 +178,6 @@ def get_package_revision(packageroot, _revcache={}):
rev = None
if wc.check(versioned=True):
rev = py.path.svnwc(packageroot).info().rev
else:
rev = py.__package__.revision
_revcache[packageroot] = rev
if packageroot.basename == "py":
assert rev is not None
......
......@@ -21,17 +21,8 @@ def pkg_to_dict(module):
for key, value in defs.iteritems():
chain = key.split('.')
base = module
try:
for elem in chain:
base = getattr(base, elem)
except RuntimeError, exc:
if elem == "greenlet":
print exc.__class__.__name__, exc
print "Greenlets not supported on this platform. Skipping apigen doc for this module"
continue
else:
raise
for elem in chain:
base = getattr(base, elem)
if value[1] == '*':
d.update(get_star_import_tree(base, key))
else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment