diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 15229b7c..332a07a2 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -95,12 +95,15 @@ c['schedulers'].append( SingleBranchScheduler( builderNames=["build-win32-py27", "build-win32-py34", "build-win32-py35", + "build-win32-py36", "build-win64-py27", "build-win64-py34", "build-win64-py35", + "build-win64-py36", "build-osx-py27", "build-osx-py34", "build-osx-py35", + "build-osx-py36", "build-gtk-py27", "build-gtk-py34", "build-gtk-py35", @@ -118,12 +121,15 @@ c['schedulers'].append( Nightly( builderNames=["dist-osx-py27", "dist-osx-py34", "dist-osx-py35", + "dist-osx-py36", "dist-win32-py27", "dist-win32-py34", "dist-win32-py35", + "dist-win32-py36", "dist-win64-py27", "dist-win64-py34", "dist-win64-py35", + "dist-win64-py36", ])) @@ -153,12 +159,15 @@ c['schedulers'].append( ForceScheduler( builderNames=["build-win32-py27", "build-win32-py34", "build-win32-py35", + "build-win32-py36", "build-win64-py27", "build-win64-py34", "build-win64-py35", + "build-win64-py36", "build-osx-py27", "build-osx-py34", "build-osx-py35", + "build-osx-py36", "build-gtk-py27", "build-gtk-py34", "build-gtk-py35", @@ -168,12 +177,15 @@ c['schedulers'].append( ForceScheduler( "dist-osx-py27", "dist-osx-py34", "dist-osx-py35", + "dist-osx-py36", "dist-win32-py27", "dist-win32-py34", "dist-win32-py35", + "dist-win32-py36", "dist-win64-py27", "dist-win64-py34", "dist-win64-py35", + "dist-win64-py36", "bdist-docs", "bdist-src", #"vagrant-bldr", @@ -296,6 +308,10 @@ c['builders'] = [ slavenames=["macosx-vm4"], factory=makeFactory('osx', pyVer='3.5')), + BuilderConfig(name="build-osx-py36", + slavenames=["macosx-vm4"], + factory=makeFactory('osx', pyVer='3.6')), + @@ -311,6 +327,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win32', pyVer='3.5')), + BuilderConfig(name="build-win32-py36", + slavenames=["win7-py27"], + factory=makeFactory('win32', pyVer='3.6')), + BuilderConfig(name="build-win64-py27", slavenames=["win7-py27"], factory=makeFactory('win64', pyVer='2.7')), @@ -323,6 +343,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win64', pyVer='3.5')), + BuilderConfig(name="build-win64-py36", + slavenames=["win7-py27"], + factory=makeFactory('win64', pyVer='3.6')), + BuilderConfig(name="build-gtk-py27", @@ -372,6 +396,10 @@ c['builders'] = [ slavenames=["macosx-vm4"], factory=makeFactory('osx', 'dist', pyVer='3.5')), + BuilderConfig(name="dist-osx-py36", + slavenames=["macosx-vm4"], + factory=makeFactory('osx', 'dist', pyVer='3.6')), + BuilderConfig(name="dist-win32-py27", slavenames=["win7-py27"], @@ -385,6 +413,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win32', 'dist', pyVer='3.5')), + BuilderConfig(name="dist-win32-py36", + slavenames=["win7-py27"], + factory=makeFactory('win32', 'dist', pyVer='3.6')), + BuilderConfig(name="dist-win64-py27", slavenames=["win7-py27"], factory=makeFactory('win64', 'dist', pyVer='2.7')), @@ -397,6 +429,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win64', 'dist', pyVer='3.5')), + BuilderConfig(name="dist-win64-py36", + slavenames=["win7-py27"], + factory=makeFactory('win64', 'dist', pyVer='3.6')), + # BuilderConfig(name="vagrant-bldr", # slavenames=["vagrant-bldr"], diff --git a/vagrant/README.rst b/vagrant/README.rst index d5de4c20..00c55e81 100644 --- a/vagrant/README.rst +++ b/vagrant/README.rst @@ -39,7 +39,7 @@ The Vagrant VMs are provisioned to contain everything they need to build Phoenix packages, except for two things: the source code and a build script to do all the work. To make this a little simpler, the VMs are also configured to share the ``{PhoenixRoot}/dist`` folder, and the -``{PhoenixRoot}/vagrant/scrtpts`` folder so they can access those two things +``{PhoenixRoot}/vagrant/scripts`` folder so they can access those two things as well. To perform a build there must be a Phoenix source tarball located in the @@ -56,11 +56,11 @@ example:: Please note that currently this will do up to 6 complete builds, one for each supported version of Python on that distro, for both gtk2 and gtk3. Additional -paramters can be passed to the ``build.sh`` script to narrow the build down to +parameters can be passed to the ``build.sh`` script to narrow the build down to a specific Python version or port. See ``build.sh`` for details. The wheel file(s) generated by the build will be placed in subfolders of -``{PhoenixRoot}/dist``. +``{PhoenixRoot}/dist/linux``. diff --git a/vagrant/centos-7/bootstrap.sh b/vagrant/centos-7/bootstrap.sh index 86befa62..729e588e 100644 --- a/vagrant/centos-7/bootstrap.sh +++ b/vagrant/centos-7/bootstrap.sh @@ -20,12 +20,14 @@ yum -y install gtk2 gtk2-devel gtk3 gtk3-devel \ yum -y install python python-tools python-devel python-virtualenv yum -y install python34u python34u-tools python34u-devel yum -y install python35u python35u-tools python35u-devel +yum -y install python36u python36u-tools python36u-devel # Set up virtual environments for each Python where the Phoenix builds will be -# done. set them to the vagrant user so the venv's can be updated by pip later. +# done. Set them to the vagrant user so the venvs can be updated by pip later. mkdir venvs virtualenv --python=python2.7 venvs/Py27 pyvenv-3.4 venvs/Py34 pyvenv-3.5 venvs/Py35 +python3.6 -m venv venvs/Py36 chown -R vagrant:vagrant venvs