diff --git a/docs/conf.py b/docs/conf.py index b7772a243..5a52f963c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,9 +24,9 @@ author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer' # The short X.Y version -version = '0.2.5' +version = '0.2.6' # The full version, including alpha/beta/rc tags -release = '0.2.5' +release = '0.2.6' # -- General configuration --------------------------------------------------- diff --git a/madminer/__version__.py b/madminer/__version__.py index fe404ae57..01ef12070 100644 --- a/madminer/__version__.py +++ b/madminer/__version__.py @@ -1 +1 @@ -__version__ = "0.2.5" +__version__ = "0.2.6" diff --git a/madminer/core.py b/madminer/core.py index 4eaede55f..576bf8bf0 100644 --- a/madminer/core.py +++ b/madminer/core.py @@ -688,7 +688,8 @@ def run( python2_override : bool, optional If True, MadMiner explicitly calls "python2" instead of relying on the system Python version to be - Python 2.6 or Python 2.7. Default: False. + Python 2.6 or Python 2.7. If you use systematics, make sure that the python interface of LHAPDF was compiled + with the Python version you are using. Default: False. Returns ------- @@ -799,7 +800,8 @@ def run_multiple( python2_override : bool, optional If True, MadMiner explicitly calls "python2" instead of relying on the system Python version to be - Python 2.6 or Python 2.7. Default: False. + Python 2.6 or Python 2.7. If you use systematics, make sure that the python interface of LHAPDF was compiled + with the Python version you are using. Default: False. Returns ------- diff --git a/madminer/utils/interfaces/mg.py b/madminer/utils/interfaces/mg.py index 43705aeb9..0efac36fb 100644 --- a/madminer/utils/interfaces/mg.py +++ b/madminer/utils/interfaces/mg.py @@ -78,7 +78,9 @@ def generate_mg_process( # Explicitly call Python 2 if necessary python_call = "python2 " if explicit_python_call else "" - _ = call_command(initial_command + python_call + mg_directory + "/bin/mg5_aMC " + temp_proc_card_file, log_file=log_file) + _ = call_command( + initial_command + python_call + mg_directory + "/bin/mg5_aMC " + temp_proc_card_file, log_file=log_file + ) def prepare_run_mg_pythia( @@ -400,7 +402,9 @@ def run_mg_pythia( # Python 2 support python_call = "python2 " if explicit_python_call else "" - _ = call_command(initial_command + python_call + mg_directory + "/bin/mg5_aMC " + proc_card_filename, log_file=log_file) + _ = call_command( + initial_command + python_call + mg_directory + "/bin/mg5_aMC " + proc_card_filename, log_file=log_file + ) def copy_ufo_model(ufo_directory, mg_directory): diff --git a/setup.py b/setup.py index fde7bbeb8..ca161a49f 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ EMAIL = 'johann.brehmer@nyu.edu' AUTHOR = 'Johann Brehmer, Felix Kling, Irina Espejo, Kyle Cranmer' REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4' -VERSION = '0.2.5' +VERSION = '0.2.6' # What packages are required for this module to be executed? REQUIRED = [