[Python-modules-commits] r26420 - in packages/sqlparse/trunk/debian (4 files)

[jollyroger-guest at users.alioth.debian.org]

    Date: Wednesday, November 6, 2013 @ 14:52:21
  Author: jollyroger-guest
Revision: 26420

Enable pytest except for pypy, fix typos, don't use python:Provides

Modified:
  packages/sqlparse/trunk/debian/changelog
  packages/sqlparse/trunk/debian/control
  packages/sqlparse/trunk/debian/pypy-sqlparse.postinst
  packages/sqlparse/trunk/debian/rules

Modified: packages/sqlparse/trunk/debian/changelog
===================================================================
--- packages/sqlparse/trunk/debian/changelog	2013-11-06 13:30:53 UTC (rev 26419)
+++ packages/sqlparse/trunk/debian/changelog	2013-11-06 14:52:21 UTC (rev 26420)
@@ -1,4 +1,4 @@
-sqlparse (0.1.10-1) UNRELEASED; urgency=low
+sqlparse (0.1.10-1) unstable; urgency=low
 
   * New upstream release(Closes: #722198)
   * Switch to pybuild, create packages for PyPy

Modified: packages/sqlparse/trunk/debian/control
===================================================================
--- packages/sqlparse/trunk/debian/control	2013-11-06 13:30:53 UTC (rev 26419)
+++ packages/sqlparse/trunk/debian/control	2013-11-06 14:52:21 UTC (rev 26420)
@@ -19,7 +19,6 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
 Breaks: ${python:Breaks}
-Provides: ${python:Provides}
 Suggests: python-sqlparse-doc (>= 0.1.6-1)
 Description: non-validating SQL parser for Python 2
  Sqlparse is a library which provides support for parsing, splitting and

Modified: packages/sqlparse/trunk/debian/pypy-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/pypy-sqlparse.postinst	2013-11-06 13:30:53 UTC (rev 26419)
+++ packages/sqlparse/trunk/debian/pypy-sqlparse.postinst	2013-11-06 14:52:21 UTC (rev 26420)
@@ -6,7 +6,7 @@
     configure)
         update-alternatives --install \
             /usr/bin/sqlformat sqlformat \
-            /usr/lib/pypy/bin/sqlparse 10 \
+            /usr/lib/pypy/bin/sqlformat 10 \
             --slave \
             /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
             /usr/share/man/man1/sqlformat-pypy.1.gz

Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules	2013-11-06 13:30:53 UTC (rev 26419)
+++ packages/sqlparse/trunk/debian/rules	2013-11-06 14:52:21 UTC (rev 26420)
@@ -1,22 +1,19 @@
 #!/usr/bin/make -f
 
-# Prevent setuptools/distribute from accessing the internet.
-#export http_proxy = http://127.0.9.1:9
-#export https_proxy = https://127.0.9.1:9
-
-export PYBUILD_DESTDIR_python2=debian/python-sqlparse/
-export PYBUILD_DESTDIR_python3=debian/python3-sqlparse/
-export PYBUILD_DESTDIR_pypy=debian/pypy-sqlparse/
+export PYBUILD_NAME=sqlparse
 export PYBUILD_TEST_PYTEST=1
-export PYBUILD_TEST_ARGS=-v {dir}/tests
-export PYBUILD_VERBOSE=1
+export PYBUILD_TEST_ARGS=-v
+# Run 2to3 against tests files if testing against python3
+export PYBUILD_BEFORE_TEST=cp -R {dir}/tests {build_dir}; [ "{version.major}" = "2" ] || 2to3 -w {build_dir}/tests
+# Disabling running tests for pypy for now due to missing dependencies
+export PYBUILD_DISABLE_pypy=test
 
 %:
 	dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf docs/build build *.egg-info debian/sqlformat-*.1
+	rm -rf docs/build debian/sqlformat-*.1
 
 override_dh_installman:
 	cp docs/sqlformat.1 debian/sqlformat-2.1
@@ -28,11 +25,11 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	sed -i '1s/python/pypy/' $(PYBUILD_DESTDIR_pypy)/usr/lib/pypy/bin/sqlformat
-	mv $(PYBUILD_DESTDIR_python2)/usr/bin/sqlformat \
-		$(PYBUILD_DESTDIR_python2)/usr/bin/sqlformat-2
-	mv $(PYBUILD_DESTDIR_python3)/usr/bin/sqlformat \
-		$(PYBUILD_DESTDIR_python3)/usr/bin/sqlformat-3
+	sed -i '1s/python/pypy/' debian/pypy-sqlparse/usr/lib/pypy/bin/sqlformat
+	mv debian/python-sqlparse/usr/bin/sqlformat \
+		debian/python-sqlparse/usr/bin/sqlformat-2
+	mv debian/python3-sqlparse/usr/bin/sqlformat \
+		debian/python3-sqlparse/usr/bin/sqlformat-3
 
 build: build-indep
 build-indep: docs/build/html