launchpad-reviewers team mailing list archive

[Jonathan Lange <jml@xxxxxxxxx>]

Jonathan Lange has proposed merging lp:~jml/launchpad/python-2.6 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jml/launchpad/python-2.6/+merge/46171

This branch changes the Makefile so that we always use Python 2.6, since we get test failures under Python 2.7.


-- 
https://code.launchpad.net/~jml/launchpad/python-2.6/+merge/46171
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jml/launchpad/python-2.6 into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2010-12-06 03:54:33 +0000
+++ Makefile	2011-01-13 18:56:28 +0000
@@ -1,7 +1,7 @@
 # This file modified from Zope3/Makefile
 # Licensed under the ZPL, (c) Zope Corporation and contributors.
 
-PYTHON=python
+PYTHON=python2.6
 WD:=$(shell pwd)
 PY=$(WD)/bin/py
 PYTHONPATH:=$(WD)/lib:$(WD)/lib/mailman:${PYTHONPATH}

=== modified file 'utilities/update-sourcecode'
--- utilities/update-sourcecode	2010-03-22 10:21:11 +0000
+++ utilities/update-sourcecode	2011-01-13 18:56:28 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python2.6 -u
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).