From 9d4ec421e4641e2357fe3c03a0bd675e96e168ce Mon Sep 17 00:00:00 2001 From: Johann Brehmer Date: Tue, 11 Jun 2019 10:33:31 -0400 Subject: [PATCH 1/2] Bumped version number --- docs/conf.py | 2 +- docs/madminer.analysis.rst | 4 ++-- docs/madminer.core.rst | 4 ++-- docs/madminer.delphes.rst | 4 ++-- docs/madminer.fisherinformation.rst | 4 ++-- docs/madminer.lhe.rst | 4 ++-- docs/madminer.limits.rst | 4 ++-- docs/madminer.ml.rst | 4 ++-- docs/madminer.plotting.rst | 4 ++-- docs/madminer.rst | 7 +++++++ docs/madminer.sampling.rst | 4 ++-- madminer/__version__.py | 2 +- setup.py | 2 +- 13 files changed, 28 insertions(+), 21 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 1f875715e..501beeac2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer' # The short X.Y version -version = '0.4.3' +version = '0.4.4' # The full version, including alpha/beta/rc tags release = version diff --git a/docs/madminer.analysis.rst b/docs/madminer.analysis.rst index 7e78d233a..50604a0ee 100644 --- a/docs/madminer.analysis.rst +++ b/docs/madminer.analysis.rst @@ -1,5 +1,5 @@ -madminer.analysis module -======================== +madminer\.analysis module +========================= .. automodule:: madminer.analysis :members: diff --git a/docs/madminer.core.rst b/docs/madminer.core.rst index d06c1788a..4edd457dc 100644 --- a/docs/madminer.core.rst +++ b/docs/madminer.core.rst @@ -1,5 +1,5 @@ -madminer.core module -==================== +madminer\.core module +===================== .. automodule:: madminer.core :members: diff --git a/docs/madminer.delphes.rst b/docs/madminer.delphes.rst index 0d9fc1553..0530abea3 100644 --- a/docs/madminer.delphes.rst +++ b/docs/madminer.delphes.rst @@ -1,5 +1,5 @@ -madminer.delphes module -======================= +madminer\.delphes module +======================== .. automodule:: madminer.delphes :members: diff --git a/docs/madminer.fisherinformation.rst b/docs/madminer.fisherinformation.rst index 80d5ec45f..641f84338 100644 --- a/docs/madminer.fisherinformation.rst +++ b/docs/madminer.fisherinformation.rst @@ -1,5 +1,5 @@ -madminer.fisherinformation module -================================= +madminer\.fisherinformation module +================================== .. automodule:: madminer.fisherinformation :members: diff --git a/docs/madminer.lhe.rst b/docs/madminer.lhe.rst index 107b92105..1f2fdb59d 100644 --- a/docs/madminer.lhe.rst +++ b/docs/madminer.lhe.rst @@ -1,5 +1,5 @@ -madminer.lhe module -=================== +madminer\.lhe module +==================== .. automodule:: madminer.lhe :members: diff --git a/docs/madminer.limits.rst b/docs/madminer.limits.rst index c023dd227..94fed7f54 100644 --- a/docs/madminer.limits.rst +++ b/docs/madminer.limits.rst @@ -1,5 +1,5 @@ -madminer.limits module -====================== +madminer\.limits module +======================= .. automodule:: madminer.limits :members: diff --git a/docs/madminer.ml.rst b/docs/madminer.ml.rst index 7809d51fb..d46001872 100644 --- a/docs/madminer.ml.rst +++ b/docs/madminer.ml.rst @@ -1,5 +1,5 @@ -madminer.ml module -================== +madminer\.ml module +=================== .. automodule:: madminer.ml :members: diff --git a/docs/madminer.plotting.rst b/docs/madminer.plotting.rst index dbd0b3272..1c4d6931e 100644 --- a/docs/madminer.plotting.rst +++ b/docs/madminer.plotting.rst @@ -1,5 +1,5 @@ -madminer.plotting module -======================== +madminer\.plotting module +========================= .. automodule:: madminer.plotting :members: diff --git a/docs/madminer.rst b/docs/madminer.rst index 2777fe07a..b00fdec2a 100644 --- a/docs/madminer.rst +++ b/docs/madminer.rst @@ -1,6 +1,13 @@ madminer package ================ +Subpackages +----------- + +.. toctree:: + + madminer.utils + Submodules ---------- diff --git a/docs/madminer.sampling.rst b/docs/madminer.sampling.rst index af9021bb4..006db4513 100644 --- a/docs/madminer.sampling.rst +++ b/docs/madminer.sampling.rst @@ -1,5 +1,5 @@ -madminer.sampling module -======================== +madminer\.sampling module +========================= .. automodule:: madminer.sampling :members: diff --git a/madminer/__version__.py b/madminer/__version__.py index f6b7e267c..cd1ee63b7 100644 --- a/madminer/__version__.py +++ b/madminer/__version__.py @@ -1 +1 @@ -__version__ = "0.4.3" +__version__ = "0.4.4" diff --git a/setup.py b/setup.py index c375562f6..6be047d43 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.4.3' +VERSION = '0.4.4' # What packages are required for this module to be executed? REQUIRED = [ From a779487d5c9e18f4ff5ef99463064111629cdb10 Mon Sep 17 00:00:00 2001 From: Johann Brehmer Date: Tue, 11 Jun 2019 10:34:47 -0400 Subject: [PATCH 2/2] Reverted some weird doc changes --- docs/madminer.analysis.rst | 4 ++-- docs/madminer.core.rst | 4 ++-- docs/madminer.delphes.rst | 4 ++-- docs/madminer.fisherinformation.rst | 4 ++-- docs/madminer.lhe.rst | 4 ++-- docs/madminer.limits.rst | 4 ++-- docs/madminer.ml.rst | 4 ++-- docs/madminer.plotting.rst | 4 ++-- docs/madminer.rst | 7 ------- docs/madminer.sampling.rst | 4 ++-- 10 files changed, 18 insertions(+), 25 deletions(-) diff --git a/docs/madminer.analysis.rst b/docs/madminer.analysis.rst index 50604a0ee..7e78d233a 100644 --- a/docs/madminer.analysis.rst +++ b/docs/madminer.analysis.rst @@ -1,5 +1,5 @@ -madminer\.analysis module -========================= +madminer.analysis module +======================== .. automodule:: madminer.analysis :members: diff --git a/docs/madminer.core.rst b/docs/madminer.core.rst index 4edd457dc..d06c1788a 100644 --- a/docs/madminer.core.rst +++ b/docs/madminer.core.rst @@ -1,5 +1,5 @@ -madminer\.core module -===================== +madminer.core module +==================== .. automodule:: madminer.core :members: diff --git a/docs/madminer.delphes.rst b/docs/madminer.delphes.rst index 0530abea3..0d9fc1553 100644 --- a/docs/madminer.delphes.rst +++ b/docs/madminer.delphes.rst @@ -1,5 +1,5 @@ -madminer\.delphes module -======================== +madminer.delphes module +======================= .. automodule:: madminer.delphes :members: diff --git a/docs/madminer.fisherinformation.rst b/docs/madminer.fisherinformation.rst index 641f84338..80d5ec45f 100644 --- a/docs/madminer.fisherinformation.rst +++ b/docs/madminer.fisherinformation.rst @@ -1,5 +1,5 @@ -madminer\.fisherinformation module -================================== +madminer.fisherinformation module +================================= .. automodule:: madminer.fisherinformation :members: diff --git a/docs/madminer.lhe.rst b/docs/madminer.lhe.rst index 1f2fdb59d..107b92105 100644 --- a/docs/madminer.lhe.rst +++ b/docs/madminer.lhe.rst @@ -1,5 +1,5 @@ -madminer\.lhe module -==================== +madminer.lhe module +=================== .. automodule:: madminer.lhe :members: diff --git a/docs/madminer.limits.rst b/docs/madminer.limits.rst index 94fed7f54..c023dd227 100644 --- a/docs/madminer.limits.rst +++ b/docs/madminer.limits.rst @@ -1,5 +1,5 @@ -madminer\.limits module -======================= +madminer.limits module +====================== .. automodule:: madminer.limits :members: diff --git a/docs/madminer.ml.rst b/docs/madminer.ml.rst index d46001872..7809d51fb 100644 --- a/docs/madminer.ml.rst +++ b/docs/madminer.ml.rst @@ -1,5 +1,5 @@ -madminer\.ml module -=================== +madminer.ml module +================== .. automodule:: madminer.ml :members: diff --git a/docs/madminer.plotting.rst b/docs/madminer.plotting.rst index 1c4d6931e..dbd0b3272 100644 --- a/docs/madminer.plotting.rst +++ b/docs/madminer.plotting.rst @@ -1,5 +1,5 @@ -madminer\.plotting module -========================= +madminer.plotting module +======================== .. automodule:: madminer.plotting :members: diff --git a/docs/madminer.rst b/docs/madminer.rst index b00fdec2a..2777fe07a 100644 --- a/docs/madminer.rst +++ b/docs/madminer.rst @@ -1,13 +1,6 @@ madminer package ================ -Subpackages ------------ - -.. toctree:: - - madminer.utils - Submodules ---------- diff --git a/docs/madminer.sampling.rst b/docs/madminer.sampling.rst index 006db4513..af9021bb4 100644 --- a/docs/madminer.sampling.rst +++ b/docs/madminer.sampling.rst @@ -1,5 +1,5 @@ -madminer\.sampling module -========================= +madminer.sampling module +======================== .. automodule:: madminer.sampling :members: