Bazaar

Merge lp:~naesten/bzr/1044043-2.4-needs-python2.6 into lp:bzr/2.4

  1. 1044043-2.4-needs-python2.6
  2. Merge into 2.4
Proposed by Samuel Bronson
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 6072
Proposed branch: lp:~naesten/bzr/1044043-2.4-needs-python2.6
Merge into: lp:bzr/2.4
Diff against target: 75 lines (+7/-19)
4 files modified
INSTALL (+1/-3)
doc/developers/code-style.txt (+3/-12)
doc/en/admin-guide/introduction.txt (+2/-3)
doc/en/user-guide/installing_bazaar.txt (+1/-1)
To merge this branch: bzr merge lp:~naesten/bzr/1044043-2.4-needs-python2.6
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+122168@code.launchpad.net

Commit message

Update docs as Python 2.6 is now the minimum supported version

Description of the change

Update docs to say we need Python 2.6, not Python 2.4.

This is most of bug #1044043; some files that could still use attention are:

doc/developers/integration.txt
doc/developers/ui.txt
doc/developers/win32_build_setup.txt

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks for fixing these docs!

I'll land and merge up.

review: Approve
Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2010-06-02 05:03:31 +0000
3+++ INSTALL 2012-08-30 22:58:21 +0000
4@@ -4,9 +4,7 @@
5 Dependencies
6 ------------
7
8-bzr requires Python2.4 and cElementTree:
9-
10- http://effbot.org/zone/element-index.htm
11+bzr requires Python 2.6 or newer.
12
13 If you wish to access branches over sftp, you will need paramiko and
14 pycrypto:
15
16=== modified file 'doc/developers/code-style.txt'
17--- doc/developers/code-style.txt 2011-06-28 21:45:01 +0000
18+++ doc/developers/code-style.txt 2012-08-30 22:58:21 +0000
19@@ -77,20 +77,11 @@
20 Python versions
21 ===============
22
23-Bazaar supports Python from 2.4 through 2.6, and in the future we want to
24-support Python 2.7 and 3.0. Avoid using language features added in 2.5,
25-2.6 or 2.7, or features deprecated in Python 3.0. (You can check v3
26+Bazaar supports Python from 2.6 through 2.7, and in the future we want to
27+support Python 3. Avoid using language features added in
28+2.7, or features deprecated in Python 3.0. (You can check v3
29 compatibility using the ``-3`` option of Python2.6.)
30
31-Specifically:
32-
33-* Don't use the ``with`` statement.
34-
35-* Don't ``from . import``.
36-
37-* Don't use ``try/except/finally``, which is not supported in Python2.4,
38- use separate nested ``try/except`` and ``try/finally`` blocks.
39-
40
41 hasattr and getattr
42 ===================
43
44=== modified file 'doc/en/admin-guide/introduction.txt'
45--- doc/en/admin-guide/introduction.txt 2010-06-02 05:03:31 +0000
46+++ doc/en/admin-guide/introduction.txt 2012-08-30 22:58:21 +0000
47@@ -31,13 +31,12 @@
48 environments. For the purposes of this document, we will consider Mac OS X as
49 a type of Unix.
50
51-In general, Bazaar requires only Python_ 2.4 or greater and the cElementTree_
52-package (included in Python 2.5 and later) to run. If you would *optionally*
53+In general, Bazaar requires only Python_ 2.6 or greater to run.
54+If you would *optionally*
55 like to be able to access branches using SFTP, you need `paramiko and
56 pycrypto`_.
57
58 .. _Python: http://www.python.org/
59-.. _cElementTree: http://effbot.org/zone/element-index.htm
60 .. _paramiko and pycrypto: http://www.lag.net/paramiko/
61
62 For maximum performance, Bazaar can make use of compiled versions of some
63
64=== modified file 'doc/en/user-guide/installing_bazaar.txt'
65--- doc/en/user-guide/installing_bazaar.txt 2010-08-13 19:08:57 +0000
66+++ doc/en/user-guide/installing_bazaar.txt 2012-08-30 22:58:21 +0000
67@@ -33,7 +33,7 @@
68 If you wish to install Bazaar from scratch rather than using a
69 pre-built package, the steps are:
70
71- 1. If it is not installed already, install Python 2.4 or later.
72+ 1. If it is not installed already, install Python 2.6 or later.
73
74 2. Download the ``bazaar-xxx.tar.gz`` file (where xxx is the version
75 number) from http://wiki.bazaar.canonical.com/Download or from Launchpad

Subscribers

People subscribed via source and target branches