Merge pull request #215 from johannbrehmer/develop

Last changes for v0.2.1
madminer-tool · Jan 17, 2019 · 8b201b9 · 8b201b9
2 parents a529195 + 1d225e9
commit 8b201b9
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 11 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,9 +24,9 @@
 author = 'Johann Brehmer, Felix Kling, and Kyle Cranmer'
 
 # The short X.Y version
-version = '0.2.0'
+version = '0.2.1'
 # The full version, including alpha/beta/rc tags
-release = '0.2.0'
+release = '0.2.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb b/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb
diff --git a/madminer/__version__.py b/madminer/__version__.py
@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
diff --git a/madminer/utils/interfaces/lhe.py b/madminer/utils/interfaces/lhe.py
@@ -571,7 +571,7 @@ def _smear_variable(true_value, resolutions, id):
 
         return true_value + np.random.normal(0.0, res, 1)
 
-    except TypeError, KeyError:
+    except (TypeError, KeyError):
         return true_value
 
 

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 EMAIL = 'johann.brehmer@nyu.edu'
 AUTHOR = 'Johann Brehmer, Felix Kling, Kyle Cranmer'
 REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4'
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 
 # What packages are required for this module to be executed?
 REQUIRED = [