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

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

    Date: Thursday, July 10, 2014 @ 14:19:34
  Author: tianon-guest
Revision: 29709

Switch to pybuild and add python3-docker

Added:
  packages/python-docker/trunk/debian/patches/
  packages/python-docker/trunk/debian/patches/requirements.patch
  packages/python-docker/trunk/debian/patches/series
Modified:
  packages/python-docker/trunk/debian/control
  packages/python-docker/trunk/debian/rules

Modified: packages/python-docker/trunk/debian/control
===================================================================
--- packages/python-docker/trunk/debian/control	2014-07-09 11:59:14 UTC (rev 29708)
+++ packages/python-docker/trunk/debian/control	2014-07-10 14:19:34 UTC (rev 29709)
@@ -8,14 +8,19 @@
 Build-Depends: debhelper (>= 9),
  python-all (>= 2.6.6-3~),
  python-setuptools,
-# python3-all (>= 3.1.2),
-# python3-setuptools
+ python-requests,
+ python-six,
+ python-websocket,
+ python3-all (>= 3.1.2),
+ python3-setuptools,
+ python3-requests,
+ python3-six,
 Standards-Version: 3.9.5
 Homepage: https://github.com/dotcloud/docker-py/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-docker/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-docker/trunk/
 X-Python-Version: >= 2.6
-#X-Python3-Version: >= 3.3
+X-Python3-Version: >= 3.3
 
 Package: python-docker
 Architecture: all
@@ -27,14 +32,12 @@
  .
  This package provides Python 2 module bindings only.
 
-# NOTE: python3-docker needs python3-websocket-client (as of 2014-03-15)
-
-# Package: python3-docker
-# Architecture: all
-# Depends: ${misc:Depends}, ${python3:Depends}
-# Description: Python 3 wrapper to access docker.io's control socket
-#  This package contains oodles of routines that aid in controling
-#  docker.io over it's socket control, the same way the docker.io
-#  client controls the daemon.
-#  .
-#  This package provides Python 3 module bindings only.
+Package: python3-docker
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python 3 wrapper to access docker.io's control socket
+ This package contains oodles of routines that aid in controling
+ docker.io over it's socket control, the same way the docker.io
+ client controls the daemon.
+ .
+ This package provides Python 3 module bindings only.

Added: packages/python-docker/trunk/debian/patches/requirements.patch
===================================================================
--- packages/python-docker/trunk/debian/patches/requirements.patch	                        (rev 0)
+++ packages/python-docker/trunk/debian/patches/requirements.patch	2014-07-10 14:19:34 UTC (rev 29709)
@@ -0,0 +1,18 @@
+diff --git a/requirements.txt b/requirements.txt
+index a1cc1af..d4920a7 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+-requests==2.2.1
++requests>=2.2.1
+ six>=1.3.0
+-websocket-client==0.11.0
++websocket-client>=0.11.0
+diff --git a/requirements3.txt b/requirements3.txt
+index 68533d1..ab74f44 100644
+--- a/requirements3.txt
++++ b/requirements3.txt
+@@ -1,2 +1,2 @@
+-requests==2.2.1
++requests>=2.2.1
+ six>=1.3.0

Added: packages/python-docker/trunk/debian/patches/series
===================================================================
--- packages/python-docker/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-docker/trunk/debian/patches/series	2014-07-10 14:19:34 UTC (rev 29709)
@@ -0,0 +1,2 @@
+# see https://github.com/dotcloud/docker-py/issues/101
+requirements.patch

Modified: packages/python-docker/trunk/debian/rules
===================================================================
--- packages/python-docker/trunk/debian/rules	2014-07-09 11:59:14 UTC (rev 29708)
+++ packages/python-docker/trunk/debian/rules	2014-07-10 14:19:34 UTC (rev 29709)
@@ -1,42 +1,10 @@
 #!/usr/bin/make -f
 
-PY2_PACKAGE_NAME=python-docker
-#PY3_PACKAGE_NAME=python3-docker
+export PYBUILD_NAME=docker
 
-PYVERS  = $(shell pyversions -r)
-#PY3VERS = $(shell py3versions -r)
+# The tests fail with the cryptic "ImportError: No module named tests".
+# I don't have the time or the energy to debug them (especially since it looks like there aren't many).
+export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python2  # ,python3
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rvf ./docs/build ./*.egg-info ./build
-
-override_dh_auto_build:
-	set -xe; \
-	#for py in $(PYVERS) $(PY3VERS); do \
-	#	$$py setup.py build; \
-	#done
-	# XXX: Remove under me once we enable py3
-	for py in $(PYVERS); do \
-		$$py setup.py build; \
-	done
-
-override_dh_auto_install:
-	set -xe; \
-	for py in $(PYVERS); do \
-		$$py setup.py install --skip-build --root debian/$(PY2_PACKAGE_NAME) \
-		--install-layout deb; \
-	done
-	#set -xe; \
-	#	for py in $(PY3VERS); do \
-	#	$$py setup.py install --skip-build --root debian/$(PY3_PACKAGE_NAME) \
-	#	--install-layout deb; \
-	#done
-	# Remove me when dh_python2 can handle this file
-	rm -vf debian/*/usr/lib/python*/*-packages/*.egg-info/SOURCES.txt
-
-override_dh_installchangelogs:
-	# The bundle on pypi doesn't include the ChangeLog.md file :(
-	dh_installchangelogs # ChangeLog.md
+	dh $@ --with python2,python3 --buildsystem pybuild