[Python-modules-commits] r23687 - in packages/sqlparse/trunk/debian (16 files)
jollyroger-guest at users.alioth.debian.org
jollyroger-guest at users.alioth.debian.org
Fri Mar 8 21:47:02 UTC 2013
Date: Friday, March 8, 2013 @ 21:47:00
Author: jollyroger-guest
Revision: 23687
New upstream version. Add python3 support
Added:
packages/sqlparse/trunk/debian/python-sqlparse-doc.doc-base
packages/sqlparse/trunk/debian/python-sqlparse-doc.docs
packages/sqlparse/trunk/debian/python-sqlparse.install
packages/sqlparse/trunk/debian/python-sqlparse.postinst
packages/sqlparse/trunk/debian/python-sqlparse.prerm
packages/sqlparse/trunk/debian/python3-sqlparse.install
packages/sqlparse/trunk/debian/python3-sqlparse.postinst
packages/sqlparse/trunk/debian/python3-sqlparse.prerm
Modified:
packages/sqlparse/trunk/debian/changelog
packages/sqlparse/trunk/debian/control
packages/sqlparse/trunk/debian/copyright
packages/sqlparse/trunk/debian/rules
packages/sqlparse/trunk/debian/watch
Deleted:
packages/sqlparse/trunk/debian/python-sqlparse.doc-base
packages/sqlparse/trunk/debian/python-sqlparse.docs
packages/sqlparse/trunk/debian/python-sqlparse.manpages
Modified: packages/sqlparse/trunk/debian/changelog
===================================================================
--- packages/sqlparse/trunk/debian/changelog 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/changelog 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1,3 +1,16 @@
+sqlparse (0.1.6-1) UNRELEASED; urgency=low
+
+ * New upstream version. (Closes: #702197, #677982)
+ * Bump Standards-Version to 3.9.4. No changes required.
+ * debian/copyright: new contributor added.
+ * Add python3 support using automatic 2to3 conversion.
+ * Move documentation to its own package python-sqlparse-doc.
+ * Add dependency on python-setuptools, python-pytest.
+ * Use alternatives mechanism to provide /usr/bin/sqlformat.
+ * Update project homepage and debian/watch.
+
+ -- Andriy Senkovych <jolly_roger at itblog.org.ua> Fri, 08 Mar 2013 21:15:06 +0200
+
sqlparse (0.1.4-1) unstable; urgency=low
* New upstream version.
Modified: packages/sqlparse/trunk/debian/control
===================================================================
--- packages/sqlparse/trunk/debian/control 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/control 2013-03-08 21:47:00 UTC (rev 23687)
@@ -3,20 +3,51 @@
Priority: optional
Maintainer: Andriy Senkovych <jolly_roger at itblog.org.ua>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.5-13~), python-sphinx (>= 1.0.7+dfsg)
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.5-13~), python3-all (>= 3.2), python-sphinx (>= 1.0.7+dfsg), python-pytest, python3-pytest, python-setuptools, python3-setuptools
Standards-Version: 3.9.3
Homepage: http://code.google.com/p/python-sqlparse/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/sqlparse/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sqlparse/trunk/
X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
Package: python-sqlparse
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
Breaks: ${python:Breaks}
+Suggests: python-sqlparse-doc
Description: non-validating SQL parser for Python
Sqlparse is a library which provides support for parsing, splitting and
customizable formatting of SQL statements in Python environment.
.
This package also provides sqlformat script which can be used as external
SQL formatting utility.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-sqlparse
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Breaks: ${python3:Breaks}
+Suggests: python-sqlparse-doc
+Description: non-validating SQL parser for Python
+ Sqlparse is a library which provides support for parsing, splitting and
+ customizable formatting of SQL statements in Python environment.
+ .
+ This package also provides sqlformat script which can be used as external
+ SQL formatting utility.
+ .
+ This is the Python 3 version of the package.
+
+Package: python-sqlparse-doc
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: non-validating SQL parser for Python
+ Sqlparse is a library which provides support for parsing, splitting and
+ customizable formatting of SQL statements in Python environment.
+ .
+ This package also provides sqlformat script which can be used as external
+ SQL formatting utility.
+ .
+ This is the Python 3 version of the package.
Modified: packages/sqlparse/trunk/debian/copyright
===================================================================
--- packages/sqlparse/trunk/debian/copyright 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/copyright 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=173&sc=0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: python-sqlparse
Upstream-Contact: Andi Albrecht <albrecht.andi at gmail.com>
Source: http://code.google.com/p/python-sqlparse/downloads/list
@@ -28,6 +28,31 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Files: sqlparse/pipeline.py
+Copyright: 2011 Jesus Leganes <piranna at gmail.com>
+License: The BSD 2-Clause License
+ 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.
+ .
+ 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 HOLDER 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.
+
Files: debian/*
Copyright: 2010 Andriy Senkovych <jolly_roger at itblog.org.ua>
License: GPL-2
Added: packages/sqlparse/trunk/debian/python-sqlparse-doc.doc-base
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse-doc.doc-base (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse-doc.doc-base 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,10 @@
+Document: python-sqlparse
+Title: sqlparse: non-validating SQL parser module for Python
+Section: Programming/Python
+Author: Andi Albrecht
+Abstract: sqlparse is a non-validating SQL parser for Python.
+ It provides support for parsing, splitting and formatting SQL statements.
+
+Format: HTML
+Index: /usr/share/doc/python-sqlparse-doc/html/index.html
+Files: /usr/share/doc/python-sqlparse-doc/html/*.html
Added: packages/sqlparse/trunk/debian/python-sqlparse-doc.docs
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse-doc.docs (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse-doc.docs 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1 @@
+docs/build/html
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.doc-base
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.doc-base 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/python-sqlparse.doc-base 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1,10 +0,0 @@
-Document: python-sqlparse
-Title: sqlparse: non-validating SQL parser module for Python
-Section: Programming/Python
-Author: Andi Albrecht
-Abstract: sqlparse is a non-validating SQL parser for Python.
- It provides support for parsing, splitting and formatting SQL statements.
-
-Format: HTML
-Index: /usr/share/doc/python-sqlparse/html/index.html
-Files: /usr/share/doc/python-sqlparse/html/*.html
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.docs
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.docs 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/python-sqlparse.docs 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1 +0,0 @@
-docs/build/html
Added: packages/sqlparse/trunk/debian/python-sqlparse.install
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.install (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse.install 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,2 @@
+/usr/lib/python2*
+/usr/share/python-sqlparse/scripts/sqlformat.py2*
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.manpages
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.manpages 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/python-sqlparse.manpages 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1 +0,0 @@
-docs/sqlformat.1
Added: packages/sqlparse/trunk/debian/python-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.postinst (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse.postinst 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+ configure)
+ update-alternatives --install \
+ /usr/bin/sqlformat sqlformat \
+ /usr/share/python-sqlparse/scripts/sqlformat.py2 10 \
+ --slave \
+ /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
+ /usr/share/man/man1/sqlformat.py2.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Added: packages/sqlparse/trunk/debian/python-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.prerm (rev 0)
+++ packages/sqlparse/trunk/debian/python-sqlparse.prerm 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ update-alternatives --remove sqlformat \
+ /usr/share/python-sqlparse/scripts/sqlformat.py2
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/sqlparse/trunk/debian/python3-sqlparse.install
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.install (rev 0)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.install 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,2 @@
+/usr/lib/python3*
+/usr/share/python-sqlparse/scripts/sqlformat.py3*
Added: packages/sqlparse/trunk/debian/python3-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.postinst (rev 0)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.postinst 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+case "$1" in
+ configure)
+ update-alternatives --install \
+ /usr/bin/sqlformat sqlformat \
+ /usr/share/python-sqlparse/scripts/sqlformat.py3 10 \
+ --slave \
+ /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
+ /usr/share/man/man1/sqlformat.py3.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/sqlparse/trunk/debian/python3-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.prerm (rev 0)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.prerm 2013-03-08 21:47:00 UTC (rev 23687)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ update-alternatives --remove sqlformat \
+ /usr/share/python-sqlparse/scripts/sqlformat.py3
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/rules 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1,20 +1,57 @@
#!/usr/bin/make -f
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
+
%:
- dh $@ --with python2 --with sphinxdoc --buildsystem python_distutils
+ dh $@ --with python2,python3,sphinxdoc --buildsystem python_distutils
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- set -e; \
- for ver in $(shell pyversions -vr); do \
- python$$ver tests/run_tests.py; \
- done
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python3%:
+ 2to3 -w sqlparse tests
+ py.test-3$* -v
+ find . -name \*.bak |xargs rename -vf 's/\.bak$$//'
+
+test-python%:
+ py.test-$* -v
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
endif
-override_dh_clean:
- rm -fR docs/build
- dh_clean
+build-python%:
+ python$* setup.py build
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+ dh_auto_build
+
+install-python3%:
+ python3$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+ mkdir -p debian/tmp/usr/share/python-sqlparse/scripts
+ mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py3
+ 2to3 -nw debian/tmp/usr/lib/python3/dist-packages/sqlparse debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py3
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+ dh_auto_install
+ mkdir -p debian/tmp/usr/share/python-sqlparse/scripts
+ mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py2
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf docs/build build *.egg-info
+ rm -f debian/sqlformat.py2.1 debian/sqlformat.py3.1
+
+install-manpages3%:
+ cp docs/sqlformat.1 debian/sqlformat.py3.1
+ dh_installman -p python3-sqlparse debian/sqlformat.py3.1
+
+override_dh_installman: $(PYTHON3:%=install-manpages%)
+ cp docs/sqlformat.1 debian/sqlformat.py2.1
+ dh_installman -p python-sqlparse debian/sqlformat.py2.1
+
build: build-indep
build-indep: docs/build/html
Modified: packages/sqlparse/trunk/debian/watch
===================================================================
--- packages/sqlparse/trunk/debian/watch 2013-03-08 18:48:49 UTC (rev 23686)
+++ packages/sqlparse/trunk/debian/watch 2013-03-08 21:47:00 UTC (rev 23687)
@@ -1,4 +1,3 @@
version=3
-opts=downloadurlmangle=s/.*\/\//http:\/\// \
- http://code.google.com/p/python-sqlparse/downloads/list \
- .*\/sqlparse-(.*)\.tar\.gz
+https://pypi.python.org/pypi/sqlparse/ \
+ .*\/sqlparse-([0-9.]+).tar.gz
More information about the Python-modules-commits
mailing list