From 3c897c0dcc752345f3e7f49bd65132237feb189e Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Fri, 23 Jun 2017 22:49:40 -0700 Subject: [PATCH 1/3] Mention Python 3 in requirements --- master/docs/manual/installation/requirements.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/master/docs/manual/installation/requirements.rst b/master/docs/manual/installation/requirements.rst index 8d9477ebd23..2a06620af23 100644 --- a/master/docs/manual/installation/requirements.rst +++ b/master/docs/manual/installation/requirements.rst @@ -12,8 +12,8 @@ At a bare minimum, you'll need the following for both the buildmaster and a work Python: https://www.python.org - Buildbot master requires Python-2.7. - Buildbot worker require Python-2.6, although Python-2.7 is recommended. + Buildbot master works with Python 2.7 or Python-3.4+. + Buildbot worker works with Python 2.6-2.7, or Python 3.4+. .. note:: From 569064112a70aa548c3a71a803a24e01a01d8fa8 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Fri, 23 Jun 2017 22:50:37 -0700 Subject: [PATCH 2/3] No need to mention future module, that is pulled in via pip. --- master/docs/manual/installation/requirements.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/master/docs/manual/installation/requirements.rst b/master/docs/manual/installation/requirements.rst index 2a06620af23..155a475b5b3 100644 --- a/master/docs/manual/installation/requirements.rst +++ b/master/docs/manual/installation/requirements.rst @@ -27,10 +27,6 @@ Twisted: http://twistedmatrix.com As always, the most recent version is recommended. Note that Twisted requires ZopeInterface to be installed as well. -Future: - - As part of ongoing (but as-yet incomplete) work to make Buildbot compatible with Python 3, the master requires the ``future`` module. - Of course, your project's build process will impose additional requirements on the workers. These hosts must have all the tools necessary to compile and test your project's source code. From f5194079d3d709fcfffaaab6530ca9e3b02f5e2b Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Fri, 23 Jun 2017 22:51:19 -0700 Subject: [PATCH 3/3] No need to mention ZopeInterface. That is pulled in via pip. --- master/docs/manual/installation/requirements.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/master/docs/manual/installation/requirements.rst b/master/docs/manual/installation/requirements.rst index 155a475b5b3..0024a659a4b 100644 --- a/master/docs/manual/installation/requirements.rst +++ b/master/docs/manual/installation/requirements.rst @@ -25,7 +25,6 @@ Twisted: http://twistedmatrix.com Buildbot requires Twisted-14.0.1 or later on the master, and Twisted-10.2.0 on the worker. In upcoming versions of Buildbot, a newer Twisted will also be required on the worker. As always, the most recent version is recommended. - Note that Twisted requires ZopeInterface to be installed as well. Of course, your project's build process will impose additional requirements on the workers. These hosts must have all the tools necessary to compile and test your project's source code.