From 21e0ffeae5cf5fd5d157d75c6339b31f86f32f21 Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Wed, 12 Jun 2019 10:47:52 +0200 Subject: [PATCH] new tag and version bump --- debian/changelog | 9 +++++++++ setup.py | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a2f2f5..1ee26c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-damaris (0.18.2) UNRELEASED; urgency=medium + + * Experiment queuing implemented + * Joachim Beerwerths (JB) fixes merged + * Experiment class tracks experiment time (JB) + * implemented rudimentary PPM display (swapped x axis) + + -- Markus Rosenstihl Wed, 12 Jun 2019 09:23:26 +0200 + python-damaris (0.18.1) unstable; urgency=medium * switch to git * pytables v2 to v3 conversion done diff --git a/setup.py b/setup.py index ce7e5aa..d9df4b5 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,6 @@ class build_damaris_scripts(_build_scripts): l=inf.readline() outf.write("sys.path.insert(0,\"%s\") # inserted by setup.py\n"%self.damaris_dir) outf.write(l) - outf.writelines(inf.readlines()) inf.close() outf.close() @@ -93,7 +92,7 @@ GPL_LICENCE = "feed licence here" setup ( name = 'python-damaris', - version = "0.15-0", + version = "0.18.2", description = 'python frontend for DAMARIS (DArmstadt MAgnetic Resonance Instrument Software)', long_description = LONG_DESCRIPTION, author = 'Achim Gaedke',