[Python-modules-commits] r33745 - in packages/python-hiredis/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Thursday, August 13, 2015 @ 19:56:59
  Author: piotr
Revision: 33745

* Team upload.
* New upstream release
* Add python3-hiredis binary package
  - dh-python, python3-all-dev and python3-setuptools added to Build-Depends
  - switched to pybuild buildsystem
  - add fix_build_dir_in_tests patch (hardcoded one doesn't match pybuild's
    build dir)
* Standards-Version bumped to 3.9.6 (no changes needed)

Added:
  packages/python-hiredis/trunk/debian/patches/fix_build_dir_in_tests.patch
Modified:
  packages/python-hiredis/trunk/debian/changelog
  packages/python-hiredis/trunk/debian/control
  packages/python-hiredis/trunk/debian/patches/series
  packages/python-hiredis/trunk/debian/rules

Modified: packages/python-hiredis/trunk/debian/changelog
===================================================================
--- packages/python-hiredis/trunk/debian/changelog	2015-08-13 19:25:05 UTC (rev 33744)
+++ packages/python-hiredis/trunk/debian/changelog	2015-08-13 19:56:59 UTC (rev 33745)
@@ -1,3 +1,16 @@
+python-hiredis (0.2.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Add python3-hiredis binary package
+    - dh-python, python3-all-dev and python3-setuptools added to Build-Depends
+    - switched to pybuild buildsystem
+    - add fix_build_dir_in_tests patch (hardcoded one doesn't match pybuild's
+      build dir)
+  * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 13 Aug 2015 21:09:20 +0200
+
 python-hiredis (0.1.4-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/python-hiredis/trunk/debian/control
===================================================================
--- packages/python-hiredis/trunk/debian/control	2015-08-13 19:25:05 UTC (rev 33744)
+++ packages/python-hiredis/trunk/debian/control	2015-08-13 19:56:59 UTC (rev 33745)
@@ -3,8 +3,11 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
-Build-Depends: debhelper (>= 9), python-all-dev, libhiredis-dev, python-setuptools
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), dh-python,
+ python-all-dev, python3-all-dev,
+ python-setuptools, python3-setuptools,
+ libhiredis-dev,
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-hiredis/trunk/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-hiredis/trunk/
@@ -12,10 +15,10 @@
 
 Package: python-hiredis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Recommends: python-redis
 Suggests: redis-server, python-gevent
-Description: redis protocol reader for Python using hiredis
+Description: redis protocol reader for Python 2.X using hiredis
  python-hiredis provides a Python extension that wraps the protocol parsing
  code in Hiredis. It is targeted at speeding up parsing multi bulk replies from
  redis-server.
@@ -26,3 +29,20 @@
  .
  python-hiredis is not a stand-alone redis client library and requires other
  code to perform low-level I/O with redis.
+
+Package: python3-hiredis
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Recommends: python3-redis
+Suggests: redis-server
+Description: redis protocol reader for Python using hiredis
+ This package provides a Python extension that wraps the protocol parsing
+ code in Hiredis. It is targeted at speeding up parsing multi bulk replies from
+ redis-server.
+ .
+ Hiredis is a minimalistic C client library for the Redis database, a
+ persistent key-value database with support for atomically manipulating and
+ querying data structures such as lists and sets.
+ .
+ Note that it is not a stand-alone redis client library and requires other
+ code to perform low-level I/O with redis.

Added: packages/python-hiredis/trunk/debian/patches/fix_build_dir_in_tests.patch
===================================================================
--- packages/python-hiredis/trunk/debian/patches/fix_build_dir_in_tests.patch	                        (rev 0)
+++ packages/python-hiredis/trunk/debian/patches/fix_build_dir_in_tests.patch	2015-08-13 19:56:59 UTC (rev 33745)
@@ -0,0 +1,22 @@
+# our build directory is in .pybuild/ so this regexp will not find
+# the right dir
+
+Index: python-hiredis-0.2.0/test/__init__.py
+===================================================================
+--- python-hiredis-0.2.0.orig/test/__init__.py
++++ python-hiredis-0.2.0/test/__init__.py
+@@ -1,11 +1,12 @@
+ import glob, os.path, sys
++from os import environ
+ 
+ version = sys.version.split(" ")[0]
+ majorminor = version[0:3]
+ 
+ # Add path to hiredis.so load path
+-path = glob.glob("build/lib*-%s/hiredis" % majorminor)[0]
+-sys.path.insert(0, path)
++path = glob.glob("build/lib*-%s/hiredis" % majorminor)
++sys.path.insert(0, environ.get('BUILDDIR', path and path[0]))
+ 
+ from unittest import *
+ from . import reader

Modified: packages/python-hiredis/trunk/debian/patches/series
===================================================================
--- packages/python-hiredis/trunk/debian/patches/series	2015-08-13 19:25:05 UTC (rev 33744)
+++ packages/python-hiredis/trunk/debian/patches/series	2015-08-13 19:56:59 UTC (rev 33745)
@@ -1 +1,2 @@
 0001-Use-system-libhiredis.patch
+fix_build_dir_in_tests.patch

Modified: packages/python-hiredis/trunk/debian/rules
===================================================================
--- packages/python-hiredis/trunk/debian/rules	2015-08-13 19:25:05 UTC (rev 33744)
+++ packages/python-hiredis/trunk/debian/rules	2015-08-13 19:56:59 UTC (rev 33745)
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+export PYBUILD_NAME=hiredis
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
-ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
-	set -ex; for python in $(shell pyversions -s); do\
-		$$python test.py; \
-	done
-endif
-
-.PHONY: override_dh_auto_test
+	dh_auto_test -- --system=custom --test-args='BUILDDIR={build_dir} {interpreter} {dir}/test.py'