From 2489a254333d7dc18ed234486b0d7dafc0264625 Mon Sep 17 00:00:00 2001 From: Riccardo De Maria <riccardodemaria@gmail.com> Date: Tue, 5 Mar 2019 16:39:40 +0100 Subject: [PATCH] version bump --- CHANGELOG.md | 15 ++++++++++----- pytimber/__init__.py | 2 +- pytimber/dataquery.py | 3 +-- pytimber/pytimber.py | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29238a9..a82fee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,19 @@ # pytimber changelog -## 06/2016 (T. Levens) + +### 2.7.0 + * Fix PEP8 issues in LHCBSRT + + +### 06/2016 (T. Levens) * Now requires cmmnbuild_dep_manager. -## 04/2016 (T. Levens) +### 04/2016 (T. Levens) * Added functions to get LHC fill information. -## 01/2016 (T. Levens) +### 01/2016 (T. Levens) * Updated repository structure * Added setup.py for setuptools/pip installation @@ -17,7 +22,7 @@ * By default, if this module is not installed then the bundled .jar file is used as before. -## 12/2015 (C. Hernalsteens) +### 12/2015 (C. Hernalsteens) Merged from my own package. The API should be identical, except for the new functionalities that should be transparent for existing use. @@ -28,7 +33,7 @@ functionalities that should be transparent for existing use. * (minor) Support for MATRIXNUMERIC datatype * (minor) Split some functions into smaller pieces -## 10/2015 (M. Betz) +### 10/2015 (M. Betz) Documentation (=examples) in pyTimberExamples.ipynb diff --git a/pytimber/__init__.py b/pytimber/__init__.py index 41aea2c..351a789 100644 --- a/pytimber/__init__.py +++ b/pytimber/__init__.py @@ -11,7 +11,7 @@ from .pagestore import PageStore -__version__ = "2.6.2" +__version__ = "2.7.0" __cmmnbuild_deps__ = [ "accsoft-cals-extr-client", diff --git a/pytimber/dataquery.py b/pytimber/dataquery.py index 0feb892..3c24e74 100644 --- a/pytimber/dataquery.py +++ b/pytimber/dataquery.py @@ -126,8 +126,7 @@ def reload(self,t1=None,t2=None): t1=parsedate(t1) t2=parsedate(t2) self.data=self.source.get(self.names,t1,t2,**self.options) - self.names=self.data.keys() - self.names.sort() + self.names=sorted(self.data.keys()) self.t1=parsedate(t1) self.t2=parsedate(t2) return self diff --git a/pytimber/pytimber.py b/pytimber/pytimber.py index 6866ac8..f4206c1 100644 --- a/pytimber/pytimber.py +++ b/pytimber/pytimber.py @@ -30,6 +30,7 @@ M. Betz <michael.betz@cern.ch> M. Fitterer <mfittere@fnal.gov> R. Castellotti <riccardo.castellotti@cern.ch> + L. Coyle <loic.coyle@epfl.ch> ''' import os