[Python-modules-commits] r26432 - in packages/sqlparse/trunk/debian (changelog control rules)

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

    Date: Friday, November 8, 2013 @ 12:14:23
  Author: jollyroger-guest
Revision: 26432

Temporary remove pypy-related code to make packages appear in archive quicker.
Do not include tests directory in the binary package.

Modified:
  packages/sqlparse/trunk/debian/changelog
  packages/sqlparse/trunk/debian/control
  packages/sqlparse/trunk/debian/rules

Modified: packages/sqlparse/trunk/debian/changelog
===================================================================
--- packages/sqlparse/trunk/debian/changelog	2013-11-08 06:28:28 UTC (rev 26431)
+++ packages/sqlparse/trunk/debian/changelog	2013-11-08 12:14:23 UTC (rev 26432)
@@ -1,9 +1,9 @@
 sqlparse (0.1.10-1) unstable; urgency=low
 
   * New upstream release(Closes: #722198)
-  * Switch to pybuild, create packages for PyPy
+  * Switch to pybuild
   * debian/control:
-    - Build-Depend on pypy, dh-python
+    - Build-Depend on dh-python
     - Fix package descriptions
 
  -- Andriy Senkovych <jolly_roger at itblog.org.ua>  Wed, 23 Oct 2013 20:04:00 +0300

Modified: packages/sqlparse/trunk/debian/control
===================================================================
--- packages/sqlparse/trunk/debian/control	2013-11-08 06:28:28 UTC (rev 26431)
+++ packages/sqlparse/trunk/debian/control	2013-11-08 12:14:23 UTC (rev 26432)
@@ -4,7 +4,7 @@
 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~), dh-python,
- python-all (>= 2.6.5-13~), python3-all (>= 3.2), pypy,
+ python-all (>= 2.6.5-13~), python3-all (>= 3.2),
  python-sphinx (>= 1.0.7+dfsg),
  python-pytest, python3-pytest,
  python-setuptools, python3-setuptools
@@ -42,18 +42,18 @@
  .
  This is the Python 3 version of the package.
 
-Package: pypy-sqlparse
-Architecture: all
-Depends: ${misc:Depends}, ${pypy:Depends}, pypy
-Suggests: python-sqlparse-doc (>= 0.1.6-1)
-Description: non-validating SQL parser for PyPy
- 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 PyPy version of the package.
+#Package: pypy-sqlparse
+#Architecture: all
+#Depends: ${misc:Depends}, ${pypy:Depends}, pypy
+#Suggests: python-sqlparse-doc (>= 0.1.6-1)
+#Description: non-validating SQL parser for PyPy
+# 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 PyPy version of the package.
 
 Package: python-sqlparse-doc
 Architecture: all

Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules	2013-11-08 06:28:28 UTC (rev 26431)
+++ packages/sqlparse/trunk/debian/rules	2013-11-08 12:14:23 UTC (rev 26432)
@@ -3,13 +3,14 @@
 export PYBUILD_NAME=sqlparse
 export PYBUILD_TEST_PYTEST=1
 export PYBUILD_TEST_ARGS=-v
-# Run 2to3 against tests files if testing against python3
+# Run 2to3 against tests files if testing against python3, clean up afterwards
 export PYBUILD_BEFORE_TEST=cp -R {dir}/tests {build_dir}; [ "{version.major}" = "2" ] || 2to3 -w {build_dir}/tests
+export PYBUILD_AFTER_TEST=rm -fR {build_dir}/tests
 # Disabling running tests for pypy for now due to missing dependencies
-export PYBUILD_DISABLE_pypy=test
+#export PYBUILD_DISABLE_pypy=test
 
 %:
-	dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -20,12 +21,12 @@
 	dh_installman -p python-sqlparse debian/sqlformat-2.1
 	cp docs/sqlformat.1 debian/sqlformat-3.1
 	dh_installman -p python3-sqlparse debian/sqlformat-3.1
-	cp docs/sqlformat.1 debian/sqlformat-pypy.1
-	dh_installman -p pypy-sqlparse debian/sqlformat-pypy.1
+	#cp docs/sqlformat.1 debian/sqlformat-pypy.1
+	#dh_installman -p pypy-sqlparse debian/sqlformat-pypy.1
 
 override_dh_auto_install:
 	dh_auto_install
-	sed -i '1s/python/pypy/' debian/pypy-sqlparse/usr/lib/pypy/bin/sqlformat
+	#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 \