From 25ec773d1d5ae6a588a17f1b2bcb1a512e2d139b Mon Sep 17 00:00:00 2001
From: Lorenzo ZOLFANELLI <lorenzo.zolfanelli@espci.psl.eu>
Date: Tue, 12 Oct 2021 22:28:39 +0200
Subject: [PATCH] Minor changes for dev branched version release
---
COPYING | 1 +
nd2reader/parser.py | 2 +-
setup.py | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/COPYING b/COPYING
index 7cd7b82..b242b98 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
Copyright 2014-2016 Jim Rybarski, 2017 Ruben Verweij
+Copyright 2020-2021 Lorenzo Zolfanelli, ESPCI Paris - PSL
nd2reader is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/nd2reader/parser.py b/nd2reader/parser.py
index 8147128..2f7b58d 100644
--- a/nd2reader/parser.py
+++ b/nd2reader/parser.py
@@ -332,7 +332,7 @@ class Parser(object):
fh.seek(image_start_pos + size_c*2*((width)*y+x0) + y*rowskip)
return np.frombuffer(fh.read(size_c*2*w), np.byte)[line_bytemask]
- data = [get_line(y) for y in tqdm(range(y0, y0+h))]
+ data = [get_line(y) for y in range(y0, y0+h)]
data = bytes().join(data)
image_group_data = array.array("H", data)
diff --git a/setup.py b/setup.py
index 0ade4f4..bf52e5b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
from setuptools import setup
-from nd2reader import __version__ as VERSION
+#from nd2reader import __version__ as VERSION
if __name__ == '__main__':
setup(
@@ -9,14 +9,14 @@ if __name__ == '__main__':
'numpy>=1.6.2',
'six>=1.4',
'xmltodict>=0.9.2',
- 'pims>=0.3.0'
+ 'PIMS>=0.5.0'
],
- version=VERSION,
+ version="3.2.3-zolfa-dev0",
description='A tool for reading ND2 files produced by NIS Elements',
author='Ruben Verweij',
author_email='ruben@lighthacking.nl',
url='https://github.com/rbnvrw/nd2reader',
- download_url='https://github.com/rbnvrw/nd2reader/tarball/%s' % VERSION,
+ download_url='https://github.com/rbnvrw/nd2reader/tarball/%s' % "3.2.3-zolfa-dev0",
keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'],
classifiers=['Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
--
GitLab