Launchpad itself

Merge lp:~jml/launchpad/python-2.6 into lp:launchpad

  1. python-2.6
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 12197
Proposed branch: lp:~jml/launchpad/python-2.6
Merge into: lp:launchpad
Diff against target: 22 lines (+2/-2)
2 files modified
Makefile (+1/-1)
utilities/update-sourcecode (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/python-2.6
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+46171@code.launchpad.net

Commit message

[r=jml][ui=none][no-qa] Always use Python 2.6.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-12-06 03:54:33 +0000
3+++ Makefile 2011-01-13 18:56:28 +0000
4@@ -1,7 +1,7 @@
5 # This file modified from Zope3/Makefile
6 # Licensed under the ZPL, (c) Zope Corporation and contributors.
7
8-PYTHON=python
9+PYTHON=python2.6
10 WD:=$(shell pwd)
11 PY=$(WD)/bin/py
12 PYTHONPATH:=$(WD)/lib:$(WD)/lib/mailman:${PYTHONPATH}
13
14=== modified file 'utilities/update-sourcecode'
15--- utilities/update-sourcecode 2010-03-22 10:21:11 +0000
16+++ utilities/update-sourcecode 2011-01-13 18:56:28 +0000
17@@ -1,4 +1,4 @@
18-#!/usr/bin/python -u
19+#!/usr/bin/python2.6 -u
20 #
21 # Copyright 2009 Canonical Ltd. This software is licensed under the
22 # GNU Affero General Public License version 3 (see the file LICENSE).