Merge lp:~jderose/microfiber/python2 into lp:microfiber

[Jason Gerard DeRose]

So this changes things so:

 * We also produce a `python-microfiber` package for Python2

 * We also run the tests under python2.7

I know I'm not running the python2.7 tests in the most proper way, but this is a stopgap anyway. We'll probably release microfiber 11.09 with python2 support, and then go for Python3 only so we can clean up the code a bit. Or we could try 3to2.py.

Anyway, but having microfiber for Python2 is important as we can more easily migrate dmedia to Python3 piecewise... by first switching dmedia to microfiber, which supports both Python2 and Python3.

[Jason Gerard DeRose (jderose)]

Ah, one thing to note. I learned to use:

  $(shell py3versions -vr)

Rather than:

  $(shell py3versions -sv)

The `-vr` flags mean that the versions are selected based on the X-Python3-Version header in debian/control. `-sv` means it gets installed for all available versions of Python.

[David Jordan (dmj726)]

Looks good. Should definitely help us migrate to python 3.

review: Approve

[Jason Gerard DeRose (jderose)]

Thanks, David! :-D

=== modified file 'debian/control'
--- debian/control	2011-08-10 13:33:42 +0000
+++ debian/control	2011-08-24 06:00:08 +0000
@@ -2,15 +2,26 @@
 Section: python
 Priority: optional
 Maintainer: Jason Gerard DeRose <[e-mail]>
-Build-Depends: debhelper (>= 8.1), python3 (>= 3.2)
+Build-Depends: debhelper (>= 8.1), python3 (>= 3.2), python (>= 2.7)
 Standards-Version: 3.9.1
-X-Python-Version: 3.2
+X-Python-Version: 2.7
 X-Python3-Version: 3.2
 Homepage: https://launchpad.net/microfiber
 
 Package: python3-microfiber
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, python3 (>= 3.2)
+Description: fabric for a lightweight Couch
+ microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
+ loving REST API like CouchDB.  Rather than wrapping the API in a bunch of
+ one-off methods, microfiber just makes it super easy to call any part of the
+ CouchDB REST API, current or future.  This approach allows microfiber to be
+ very simple and basically maintenance free as it requires no changes to support
+ new additions to the CouchDB API.
+
+Package: python-microfiber
+Architecture: all
+Depends: ${misc:Depends}, python (>= 2.7)
 Description: fabric for a lightweight Couch
  microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
  loving REST API like CouchDB.  Rather than wrapping the API in a bunch of

=== modified file 'debian/rules'
--- debian/rules	2011-08-10 13:31:19 +0000
+++ debian/rules	2011-08-24 06:00:08 +0000
@@ -3,16 +3,22 @@
 PYTHON3=$(shell py3versions -vr)
 
 %:
-	dh $@ --with=python3
+	dh $@ --with=python3 --with=python2
 
 test-python%:
 	python$* setup.py test -vv
+	python2.7 setup.py test -vv
 
 override_dh_auto_install:
-	for pyvers in $(shell py3versions -sv); do \
+	for pyvers in $(shell py3versions -vr); do \
 		python$$pyvers setup.py install \
 				--install-layout=deb \
 				--root $(CURDIR)/debian/python3-microfiber; \
 	done
+	for pyvers in $(shell pyversions -vr); do \
+		python$$pyvers setup.py install \
+				--install-layout=deb \
+				--root $(CURDIR)/debian/python-microfiber; \
+	done
 
 override_dh_auto_test: $(PYTHON3:%=test-python%)