[Python-modules-commits] r22162 - in packages/numpydoc/trunk/debian (9 files)
dlax-guest at users.alioth.debian.org
dlax-guest at users.alioth.debian.org
Wed Jun 13 14:57:59 UTC 2012
Date: Wednesday, June 13, 2012 @ 14:57:58
Author: dlax-guest
Revision: 22162
update numpydoc packaging
- rename binary package as python-numpydoc-sphinx
- patch setup.py to avoid setuptools
- run tests at build time
- machine-readable copyright
- set myself as maintainer
Added:
packages/numpydoc/trunk/debian/patches/
packages/numpydoc/trunk/debian/patches/clean-setup.patch
packages/numpydoc/trunk/debian/patches/series
Modified:
packages/numpydoc/trunk/debian/changelog
packages/numpydoc/trunk/debian/compat
packages/numpydoc/trunk/debian/control
packages/numpydoc/trunk/debian/copyright
packages/numpydoc/trunk/debian/rules
packages/numpydoc/trunk/debian/watch
Modified: packages/numpydoc/trunk/debian/changelog
===================================================================
--- packages/numpydoc/trunk/debian/changelog 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/changelog 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1,6 +1,5 @@
-numpydoc (0.4-1) UNRELEASED; urgency=low
+numpydoc (0.4-1) unstable; urgency=low
- * Initial release. (Closes: 631877)
+ * Initial release (Closes: #559916)
- -- Luis Pedro Coelho <luis at luispedro.org> Mon, 26 Jun 2011 18:24:30 -0500
-
+ -- Denis Laxalde <denis at laxalde.org> Wed, 06 Jun 2012 15:20:20 -0400
Modified: packages/numpydoc/trunk/debian/compat
===================================================================
--- packages/numpydoc/trunk/debian/compat 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/compat 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1 +1 @@
-7
+8
Modified: packages/numpydoc/trunk/debian/control
===================================================================
--- packages/numpydoc/trunk/debian/control 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/control 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1,25 +1,20 @@
Source: numpydoc
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Luis Pedro Coelho <luis at luispedro.org>
Section: python
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~),
- python-all-dev (>= 2.6.6),
- python-setuptools (>= 0.6b3)
-Standards-Version: 3.9.2
-X-Python-Version: >= 2.5
-Homepage: http://pypi.python.org/pypi/numpydoc/
+Maintainer: Denis Laxalde <denis at laxalde.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 8), python-nose, python-sphinx (>= 1.0.1)
+Standards-Version: 3.9.3
+Homepage: https://github.com/numpy/numpy/tree/master/doc/sphinxext
+X-Python-Version: >= 2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpydoc/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/numpydoc/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpydoc/trunk/
-Package: python-numpydoc
-Architecture: any
-Depends: python-jinja2,
- python-sphinx,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Description: Numpy's Sphinx extensions
- These are extensions to Sphinx syntax initially developed for the numpy
- project.
-
+Package: python-numpydoc-sphinx
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-sphinx (>= 1.0.1)
+Suggests: python-matplotlib
+Description: Sphinx extension to support docstrings in Numpy format
+ This package defines several extensions for the Sphinx documentation
+ system, shipped in the numpydoc Python package. In particular, these provide
+ support for the Numpy docstring format in Sphinx.
Modified: packages/numpydoc/trunk/debian/copyright
===================================================================
--- packages/numpydoc/trunk/debian/copyright 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/copyright 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1,97 +1,122 @@
--------------------------------------------------------------------------------
- The files
- - numpydoc.py
- - autosummary.py
- - autosummary_generate.py
- - docscrape.py
- - docscrape_sphinx.py
- - phantom_import.py
- have the following license:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: numpydoc
+Source: http://pypi.python.org/pypi/numpydoc
-Copyright (C) 2008 Stefan van der Walt <stefan at mentat.za.net>, Pauli Virtanen <pav at iki.fi>
+Files: numpydoc.py docscrape.py docscrape_sphinx.py phantom_import.py
+Copyright: 2008, Stefan van der Walt <stefan at mentat.za.net>
+ 2008, Pauli Virtanen <pav at iki.fi>
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Files: compiler_unparse.py comment_eater.py traitsdoc.py
+Copyright: 2006 Enthought, Inc.
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of Enthought, Inc. nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
+Files: plot_directive.py
+Copyright: 2002-2008 John D. Hunter
+License:
+ 1. This LICENSE AGREEMENT is between John D. Hunter (“JDHâ€), and the
+ Individual or Organization (“Licenseeâ€) accessing and otherwise using
+ matplotlib software in source or binary form and its associated
+ documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, JDH
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
+ reproduce, analyze, test, perform and/or display publicly, prepare
+ derivative works, distribute, and otherwise use matplotlib 0.98.3 alone or
+ in any derivative version, provided, however, that JDH’s License Agreement
+ and JDH’s notice of copyright, i.e., “Copyright (c) 2002-2008 John D.
+ Hunter; All Rights Reserved†are retained in matplotlib 0.98.3 alone or in
+ any derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on or
+ incorporates matplotlib 0.98.3 or any part thereof, and wants to make the
+ derivative work available to others as provided herein, then Licensee
+ hereby agrees to include in any such work a brief summary of the changes
+ made to matplotlib 0.98.3.
+ .
+ 4. JDH is making matplotlib 0.98.3 available to Licensee on an “AS ISâ€
+ basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY
+ WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND DISCLAIMS ANY
+ REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
+ PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.98.3 WILL NOT INFRINGE
+ ANY THIRD PARTY RIGHTS.
+ .
+ 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
+ 0.98.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+ RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING MATPLOTLIB 0.98.3,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between JDH and
+ Licensee. This License Agreement does not grant permission to use JDH
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using matplotlib 0.98.3, Licensee
+ agrees to be bound by the terms and conditions of this License Agreement.
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------------------------------------
- The files
- - compiler_unparse.py
- - comment_eater.py
- - traitsdoc.py
- have the following license:
-
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-Copyright (c) 2006, Enthought, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of Enthought, Inc. nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
--------------------------------------------------------------------------------
- The files
- - only_directives.py
- - plot_directive.py
- originate from Matplotlib (http://matplotlib.sf.net/) which has
- the following license:
-
-Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved.
-
-1. This LICENSE AGREEMENT is between John D. Hunter (“JDHâ€), and the Individual or Organization (“Licenseeâ€) accessing and otherwise using matplotlib software in source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, JDH hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use matplotlib 0.98.3 alone or in any derivative version, provided, however, that JDH’s License Agreement and JDH’s notice of copyright, i.e., “Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved†are retained in matplotlib 0.98.3 alone or in any derivative version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on or incorporates matplotlib 0.98.3 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to matplotlib 0.98.3.
-
-4. JDH is making matplotlib 0.98.3 available to Licensee on an “AS IS†basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.98.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB 0.98.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING MATPLOTLIB 0.98.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between JDH and Licensee. This License Agreement does not grant permission to use JDH trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using matplotlib 0.98.3, Licensee agrees to be bound by the terms and conditions of this License Agreement.
-
+Files: debian/*
+Copyright: 2012 Denis Laxalde <denis at laxalde.org>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in the `/usr/share/common-licenses/GPL' file.
Added: packages/numpydoc/trunk/debian/patches/clean-setup.patch
===================================================================
--- packages/numpydoc/trunk/debian/patches/clean-setup.patch (rev 0)
+++ packages/numpydoc/trunk/debian/patches/clean-setup.patch 2012-06-13 14:57:58 UTC (rev 22162)
@@ -0,0 +1,37 @@
+Description: Clean setup.py
+ Remove obsolete arguments from setup() and use plain distutils not
+ setuptools.
+Forwarded: https://github.com/numpy/numpy/pull/298
+Applied-Upstream: https://github.com/numpy/numpy/commit/adddbc72a7aa9faeb61c708f1c2c0568d0398303
+--- a/setup.py
++++ b/setup.py
+@@ -1,13 +1,11 @@
+ from distutils.core import setup
+-import setuptools
+-import sys, os
+
+ version = "0.4"
+
+ setup(
+ name="numpydoc",
+ packages=["numpydoc"],
+- package_dir={"numpydoc": ""},
++ package_dir={"numpydoc": "."},
+ version=version,
+ description="Sphinx extension to support docstrings in Numpy format",
+ # classifiers from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+@@ -20,12 +18,6 @@
+ author_email="pav at iki.fi",
+ url="http://github.com/numpy/numpy/tree/master/doc/sphinxext",
+ license="BSD",
+- zip_safe=False,
+- install_requires=["Sphinx >= 1.0.1"],
+- package_data={'numpydoc': 'tests', '': ''},
+- entry_points={
+- "console_scripts": [
+- "autosummary_generate = numpydoc.autosummary_generate:main",
+- ],
+- },
++ requires=["sphinx (>= 1.0.1)"],
++ package_data={'numpydoc': ['tests/test_*.py']},
+ )
Added: packages/numpydoc/trunk/debian/patches/series
===================================================================
--- packages/numpydoc/trunk/debian/patches/series (rev 0)
+++ packages/numpydoc/trunk/debian/patches/series 2012-06-13 14:57:58 UTC (rev 22162)
@@ -0,0 +1 @@
+clean-setup.patch
Modified: packages/numpydoc/trunk/debian/rules
===================================================================
--- packages/numpydoc/trunk/debian/rules 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/rules 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1,10 +1,17 @@
#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+
%:
dh $@ --with python2
-override_dh_clean:
- dh_clean
- rm -rf *.egg-info/
- rm -rf build
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+ nosetests-$* tests/test_docscrape.py
+override_dh_auto_test: $(PYTHON2:%=test-python%)
+endif
Modified: packages/numpydoc/trunk/debian/watch
===================================================================
--- packages/numpydoc/trunk/debian/watch 2012-06-13 14:08:51 UTC (rev 22161)
+++ packages/numpydoc/trunk/debian/watch 2012-06-13 14:57:58 UTC (rev 22162)
@@ -1,2 +1,2 @@
version=3
-http://pypi.python.org/packages/source/n/numpydoc/numpydoc-(.*).tar.gz
+http://pypi.python.org/packages/source/n/numpydoc/numpydoc-([0-9a-z.]*)\.tar\.gz
More information about the Python-modules-commits
mailing list