diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 1959fab08c..d1f9a97e0d 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -400,15 +400,14 @@ def websiteFactory(platform, fullBuild=False): # The reworked Python builder factory. It relies on Miniconda and can handle both 32bit and 64bit builds -# Currently, it only supports Windows, but the plan is to integrate MacOS and Linux builds here as well. -# You have to have both CMake and Git available on your standard command line, pay attention when installing -# these two tools on your Windows machine. +# You have to have both CMake and Git available on your standard command line, pay attention tp this +# when installing these two tools on your Windows machine. def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name")): # # Do you want me to install the required packages? Enable this for new slaves. installPackages = False buildPyPI = checkID(pyID, teID=100, strict=False) or checkID(pyID, teID=200, strict=False) # Only build and upload Windows and Mac wheels - buildConda = False + buildConda = True workingFolder = "build/wrappers/Python" installFolder = "install_root" defTimeout = 1800 # New timeout required for slow 64bit Linux builds: timeout=defTimeout diff --git a/wrappers/Python/generate_meta_info.py b/wrappers/Python/generate_meta_info.py index 4f3374fc4d..8349d6d93e 100644 --- a/wrappers/Python/generate_meta_info.py +++ b/wrappers/Python/generate_meta_info.py @@ -5,7 +5,7 @@ from distutils.version import LooseVersion #, StrictVersion import codecs -""" A simple script to create a conda recipe and the infrostructure files for PyPI""" +""" A simple script to create a conda recipe and the infrastructure files for PyPI""" first_line = "# CAUTION: This file is generated automatically, any customisation will be lost.\n"