Browse Source

complete fork: nd2reader -> nd2reader2

zolfa-add_slices_loading
Zolfa 2 years ago
parent
commit
f220515eb6
22 changed files with 66 additions and 59 deletions
  1. +0
    -5
      nd2reader/__init__.py
  2. +5
    -0
      nd2reader2/__init__.py
  3. +1
    -1
      nd2reader2/artificial.py
  4. +19
    -12
      nd2reader2/common.py
  5. +1
    -1
      nd2reader2/common_raw_metadata.py
  6. +0
    -0
      nd2reader2/exceptions.py
  7. +0
    -0
      nd2reader2/label_map.py
  8. +1
    -1
      nd2reader2/legacy.py
  9. +4
    -4
      nd2reader2/parser.py
  10. +2
    -2
      nd2reader2/raw_metadata.py
  11. +2
    -2
      nd2reader2/reader.py
  12. +0
    -0
      nd2reader2/stitched.py
  13. +7
    -7
      setup.py
  14. +1
    -1
      test.py
  15. +3
    -3
      tests/test_artificial.py
  16. +3
    -3
      tests/test_common.py
  17. +2
    -2
      tests/test_label_map.py
  18. +3
    -3
      tests/test_legacy.py
  19. +3
    -3
      tests/test_parser.py
  20. +4
    -4
      tests/test_raw_metadata.py
  21. +4
    -4
      tests/test_reader.py
  22. +1
    -1
      tests/test_version.py

+ 0
- 5
nd2reader/__init__.py View File

@ -1,5 +0,0 @@
from os import path
from nd2reader.reader import ND2Reader
from nd2reader.legacy import Nd2
__version__ = '3.2.3'

+ 5
- 0
nd2reader2/__init__.py View File

@ -0,0 +1,5 @@
from os import path
from nd2reader2.reader import ND2Reader
from nd2reader2.legacy import Nd2
__version__ = '3.2.3'

nd2reader/artificial.py → nd2reader2/artificial.py View File


nd2reader/common.py → nd2reader2/common.py View File


nd2reader/common_raw_metadata.py → nd2reader2/common_raw_metadata.py View File


nd2reader/exceptions.py → nd2reader2/exceptions.py View File


nd2reader/label_map.py → nd2reader2/label_map.py View File


nd2reader/legacy.py → nd2reader2/legacy.py View File


nd2reader/parser.py → nd2reader2/parser.py View File


nd2reader/raw_metadata.py → nd2reader2/raw_metadata.py View File


nd2reader/reader.py → nd2reader2/reader.py View File


nd2reader/stitched.py → nd2reader2/stitched.py View File


+ 7
- 7
setup.py View File

@ -3,20 +3,20 @@ from setuptools import setup
if __name__ == '__main__':
setup(
name='nd2reader',
packages=['nd2reader'],
name='nd2reader2',
packages=['nd2reader2'],
install_requires=[
'numpy>=1.6.2',
'six>=1.4',
'xmltodict>=0.9.2',
'PIMS>=0.5.0'
],
version="3.2.3-zolfa-dev0",
version="0.0.1",
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' % "3.2.3-zolfa-dev0",
author='Lorenzo Zolfanelli',
author_email='dev@zolfa.nl',
url='https://projects.lilik.it/zolfa/nd2reader2',
download_url='https://github.com/rbnvrw/nd2reader2/tarball/%s' % "0.0.1",
keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'],
classifiers=['Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',


+ 1
- 1
test.py View File

@ -3,4 +3,4 @@ from os import path
file_path = path.abspath(__file__)
tests_path = path.join(path.abspath(path.dirname(file_path)), "tests")
nose.main(argv=[path.abspath(__file__), "--with-coverage", "--cover-erase", "--cover-package=nd2reader", tests_path])
nose.main(argv=[path.abspath(__file__), "--with-coverage", "--cover-erase", "--cover-package=nd2reader2", tests_path])

+ 3
- 3
tests/test_artificial.py View File

@ -3,10 +3,10 @@ from os import path
import six
import struct
from nd2reader.artificial import ArtificialND2
from nd2reader.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \
from nd2reader2.artificial import ArtificialND2
from nd2reader2.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \
_parse_unsigned_int, _parse_unsigned_long, _parse_double, check_or_make_dir
from nd2reader.exceptions import InvalidVersionError
from nd2reader2.exceptions import InvalidVersionError
class TestArtificial(unittest.TestCase):


+ 3
- 3
tests/test_common.py View File

@ -5,11 +5,11 @@ import array
import six
import struct
from nd2reader.artificial import ArtificialND2
from nd2reader.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \
from nd2reader2.artificial import ArtificialND2
from nd2reader2.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \
_parse_unsigned_int, _parse_unsigned_long, _parse_double, check_or_make_dir, _parse_string, _parse_char_array, \
get_from_dict_if_exists, read_chunk
from nd2reader.exceptions import InvalidVersionError
from nd2reader2.exceptions import InvalidVersionError
class TestCommon(unittest.TestCase):


+ 2
- 2
tests/test_label_map.py View File

@ -1,6 +1,6 @@
import unittest
from nd2reader.label_map import LabelMap
from nd2reader.artificial import ArtificialND2
from nd2reader2.label_map import LabelMap
from nd2reader2.artificial import ArtificialND2
class TestLabelMap(unittest.TestCase):


+ 3
- 3
tests/test_legacy.py View File

@ -1,9 +1,9 @@
import unittest
import warnings
from nd2reader.legacy import Nd2
from nd2reader.reader import ND2Reader
from nd2reader.artificial import ArtificialND2
from nd2reader2.legacy import Nd2
from nd2reader2.reader import ND2Reader
from nd2reader2.artificial import ArtificialND2
class TestLegacy(unittest.TestCase):


+ 3
- 3
tests/test_parser.py View File

@ -1,8 +1,8 @@
import unittest
from os import path
from nd2reader.artificial import ArtificialND2
from nd2reader.common import check_or_make_dir
from nd2reader.parser import Parser
from nd2reader2.artificial import ArtificialND2
from nd2reader2.common import check_or_make_dir
from nd2reader2.parser import Parser
import urllib.request


+ 4
- 4
tests/test_raw_metadata.py View File

@ -1,10 +1,10 @@
import unittest
import six
from nd2reader.artificial import ArtificialND2
from nd2reader.label_map import LabelMap
from nd2reader.raw_metadata import RawMetadata
from nd2reader.common_raw_metadata import parse_roi_shape, parse_roi_type, parse_dimension_text_line
from nd2reader2.artificial import ArtificialND2
from nd2reader2.label_map import LabelMap
from nd2reader2.raw_metadata import RawMetadata
from nd2reader2.common_raw_metadata import parse_roi_shape, parse_roi_type, parse_dimension_text_line
class TestRawMetadata(unittest.TestCase):


+ 4
- 4
tests/test_reader.py View File

@ -3,10 +3,10 @@ import numpy as np
import struct
from pims import Frame
from nd2reader.artificial import ArtificialND2
from nd2reader.exceptions import EmptyFileError, InvalidFileType
from nd2reader.reader import ND2Reader
from nd2reader.parser import Parser
from nd2reader2.artificial import ArtificialND2
from nd2reader2.exceptions import EmptyFileError, InvalidFileType
from nd2reader2.reader import ND2Reader
from nd2reader2.parser import Parser
class TestReader(unittest.TestCase):


+ 1
- 1
tests/test_version.py View File

@ -1,5 +1,5 @@
import unittest
from nd2reader import __version__ as VERSION
from nd2reader2 import __version__ as VERSION
class TestVersion(unittest.TestCase):


Loading…
Cancel
Save