From fe83f1609f3a90ec98c732536ff5387348d0ab09 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Sat, 12 Sep 2015 08:02:30 +0000
Subject: [PATCH] Added Python 3 support.

---
 debian/changelog |  6 +++++
 debian/control   | 70 +++++++++++++++++++++++++++++++++++++++++++++++-
 debian/rules     | 16 ++++++++++-
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfe07ccb..68bcdeb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-taskflow (1.17.0-3) experimental; urgency=medium
+
+  * Added Python3 support (Closes: #798018).
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 12 Sep 2015 07:56:16 +0000
+
 python-taskflow (1.17.0-2) experimental; urgency=medium
 
   * Applied what's remaining as usefull in the Ubuntu patch (Closes: #791930).
diff --git a/debian/control b/debian/control
index 7f79c6b4..fdbc4a10 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9),
                python-setuptools,
                python-sphinx,
 Build-Depends-Indep: alembic (>= 0.7.2),
+                     python-alembic,
                      python-automaton,
                      python-cachetools,
                      python-concurrent.futures (>= 3.0),
@@ -42,6 +43,37 @@ Build-Depends-Indep: alembic (>= 0.7.2),
                      python-testtools (>= 1.4.0),
                      python-unittest2,
                      python-zake,
+                     python3-alembic,
+                     python3-automaton,
+                     python3-cachetools,
+                     python3-concurrent.futures (>= 3.0),
+                     python3-contextlib2,
+                     python3-coverage,
+                     python3-debtcollector (>= 0.3.0),
+                     python3-eventlet (>= 0.17.4),
+                     python3-fasteners,
+                     python3-futurist,
+                     python3-jsonschema,
+                     python3-kazoo (>= 2.2),
+                     python3-kombu,
+                     python3-mock (>= 1.3),
+                     python3-monotonic (>= 0.1),
+                     python3-mysqldb,
+                     python3-networkx,
+                     python3-oslo.serialization (>= 1.4.0),
+                     python3-oslo.utils (>= 1.9.0),
+                     python3-oslosphinx (>= 2.5.0),
+                     python3-oslotest (>= 1.7.0),
+                     python3-psycopg2,
+                     python3-redis,
+                     python3-six (>= 1.9.0),
+                     python3-sqlalchemy (>= 0.9.7),
+                     python3-stevedore (>= 1.5.0),
+                     python3-subunit,
+                     python3-testscenarios (>= 0.4),
+                     python3-testtools (>= 1.4.0),
+                     python3-unittest2,
+                     python3-zake,
                      subunit,
                      testrepository,
 Standards-Version: 3.9.6
@@ -78,7 +110,43 @@ Depends: alembic (>= 0.7.2),
          ${misc:Depends},
          ${python:Depends},
 Recommends: ${python:Recommends},
-Description: Taskflow structured state management library
+Description: Taskflow structured state management library - Python 2.7
  TaskFlow, is a library to do [jobs, tasks, flows] in a HA manner
  using different backends to be used with OpenStack projects.
  More information at http://wiki.openstack.org/wiki/TaskFlow
+ .
+ This package contains the Python 2.7 module.
+
+Package: python3-taskflow
+Architecture: all
+Depends: alembic (>= 0.7.2),
+         python3-automaton,
+         python3-cachetools,
+         python3-concurrent.futures (>= 3.0),
+         python3-contextlib2,
+         python3-debtcollector (>= 0.3.0),
+         python3-eventlet (>= 0.17.4),
+         python3-fasteners,
+         python3-futurist,
+         python3-jsonschema,
+         python3-kazoo,
+         python3-kombu,
+         python3-monotonic (>= 0.1),
+         python3-mysqldb,
+         python3-networkx,
+         python3-oslo.serialization (>= 1.4.0),
+         python3-oslo.utils (>= 1.9.0),
+         python3-pbr (>= 1.3),
+         python3-psycopg2,
+         python3-six (>= 1.9.0),
+         python3-sqlalchemy (>= 0.9.7),
+         python3-stevedore (>= 1.5.0),
+         ${misc:Depends},
+         ${python3:Depends},
+Recommends: ${python:Recommends},
+Description: Taskflow structured state management library - Python 3.x
+ TaskFlow, is a library to do [jobs, tasks, flows] in a HA manner
+ using different backends to be used with OpenStack projects.
+ More information at http://wiki.openstack.org/wiki/TaskFlow
+ .
+ This package contains the Python 3.x module.
diff --git a/debian/rules b/debian/rules
index bab32ee6..a5132866 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,26 @@
 #!/usr/bin/make -f
 
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
 UPSTREAM_GIT = git://github.com/openstack/taskflow.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-	dh $@ --buildsystem=python_distutils --with python2
+	dh $@ --buildsystem=python_distutils --with python2,python3
+
+override_dh_install:
+	set -e ; for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-taskflow; \
+	done
+	set -e ; for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-taskflow; \
+	done
+	rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth
 
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils