Skip to content
Snippets Groups Projects
Commit 2786c9ff authored by Lorenzo  ZOLFANELLI's avatar Lorenzo ZOLFANELLI
Browse files

prepare hard fork

parent 026928a1
Branches
Tags
No related merge requests found
Showing
with 77 additions and 57 deletions
[build-system]
requires = [
"setuptools>=42",
"wheel",
"setuptools_scm[toml]>3.4",
]
build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
write_to = "src/zolfa/nd2reader/version.py"
[metadata] [metadata]
name = zolfa-nd2reader
version = attr:zolfa.nd2reader.version
description = A tool for reading ND2 files produced by NIS Elements
description-file = README.md description-file = README.md
classifiers =
Development Status :: 5 - Production/Stable
Intended Audience :: Science/Research
License :: Freely Distributable
License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Operating System :: POSIX :: Linux
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3.4
Topic :: Scientific/Engineering
keywords =
nd2
nikon
microscopy
NIS Elements
author = Ruben Verweij, Lorenzo Zolfanelli
author_email = dev@zolfa.nl
url = https://projects.lilik.it/zolfa/zolfa-nd2reader
[options]
packages = find_namespace:
package_dir =
= src
python_requires = >=3.6
install_requires =
numpy>=1.14
six>=1.4
xmltodict>=0.9.2
PIMS>=0.5.0
setup_requires =
setuptools_scm
[options.packages.find]
where = src
include = zolfa.*
[bdist_wheel] [bdist_wheel]
universal=1 universal=1
\ No newline at end of file
from setuptools import setup
#from nd2reader import __version__ as VERSION
if __name__ == '__main__':
setup(
name='nd2reader',
packages=['nd2reader'],
install_requires=[
'numpy>=1.14',
'six>=1.4',
'xmltodict>=0.9.2',
'PIMS>=0.5.0'
],
python_requires=">=3.6",
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' % "3.2.3-zolfa-dev0",
keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'],
classifiers=['Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
'License :: Freely Distributable',
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Topic :: Scientific/Engineering',
]
)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sphinx_bootstrap_theme import sphinx_bootstrap_theme
from recommonmark.parser import CommonMarkParser from recommonmark.parser import CommonMarkParser
from nd2reader import __version__ as VERSION from zolfa.nd2reader.version import __version__ as VERSION
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------
...@@ -36,9 +36,9 @@ source_suffix = ['.rst', '.md'] ...@@ -36,9 +36,9 @@ source_suffix = ['.rst', '.md']
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = 'nd2reader' project = 'zolfa-nd2reader'
copyright = '2017 - 2019, Ruben Verweij' copyright = '2017 - 2019, Ruben Verweij'
author = 'Ruben Verweij' author = 'Ruben Verweij, Lorenzo Zolfanelli'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
......
from os import path from os import path
from nd2reader.reader import ND2Reader from zolfa.nd2reader.reader import ND2Reader
from nd2reader.legacy import Nd2 from zolfa.nd2reader.legacy import Nd2
try: try:
import importlib.metadata as importlib_metadata import importlib.metadata as importlib_metadata
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import six import six
import numpy as np import numpy as np
import struct import struct
from nd2reader.common import check_or_make_dir from zolfa.nd2reader.common import check_or_make_dir
from os import path from os import path
global_labels = ['image_attributes', 'image_text_info', 'image_metadata', global_labels = ['image_attributes', 'image_text_info', 'image_metadata',
......
...@@ -4,7 +4,7 @@ import array ...@@ -4,7 +4,7 @@ import array
from datetime import datetime from datetime import datetime
import six import six
import re import re
from nd2reader.exceptions import InvalidVersionError from zolfa.nd2reader.exceptions import InvalidVersionError
def get_version(fh): def get_version(fh):
......
import six import six
import warnings import warnings
from nd2reader.common import get_from_dict_if_exists from zolfa.nd2reader.common import get_from_dict_if_exists
def parse_if_not_none(to_check, callback): def parse_if_not_none(to_check, callback):
......
File moved
File moved
...@@ -4,7 +4,7 @@ Legacy class for backwards compatibility ...@@ -4,7 +4,7 @@ Legacy class for backwards compatibility
import warnings import warnings
from nd2reader import ND2Reader from zolfa.nd2reader import ND2Reader
class Nd2(object): class Nd2(object):
......
...@@ -7,10 +7,10 @@ import warnings ...@@ -7,10 +7,10 @@ import warnings
from pims.base_frames import Frame from pims.base_frames import Frame
import numpy as np import numpy as np
from nd2reader.common import get_version, read_chunk from zolfa.nd2reader.common import get_version, read_chunk
from nd2reader.label_map import LabelMap from zolfa.nd2reader.label_map import LabelMap
from nd2reader.raw_metadata import RawMetadata from zolfa.nd2reader.raw_metadata import RawMetadata
from nd2reader import stitched from zolfa.nd2reader import stitched
class Parser(object): class Parser(object):
......
...@@ -4,8 +4,8 @@ import six ...@@ -4,8 +4,8 @@ import six
import numpy as np import numpy as np
import warnings import warnings
from nd2reader.common import read_chunk, read_array, read_metadata, parse_date, get_from_dict_if_exists from zolfa.nd2reader.common import read_chunk, read_array, read_metadata, parse_date, get_from_dict_if_exists
from nd2reader.common_raw_metadata import parse_dimension_text_line, parse_if_not_none, parse_roi_shape, parse_roi_type, get_loops_from_data, determine_sampling_interval from zolfa.nd2reader.common_raw_metadata import parse_dimension_text_line, parse_if_not_none, parse_roi_shape, parse_roi_type, get_loops_from_data, determine_sampling_interval
class RawMetadata(object): class RawMetadata(object):
......
from pims import Frame from pims import Frame
from pims.base_frames import FramesSequenceND from pims.base_frames import FramesSequenceND
from nd2reader.exceptions import EmptyFileError, InvalidFileType from zolfa.nd2reader.exceptions import EmptyFileError, InvalidFileType
from nd2reader.parser import Parser from zolfa.nd2reader.parser import Parser
import numpy as np import numpy as np
......
File moved
# file generated by setuptools_scm
# don't change, don't track in version control
__version__ = version = '2.0.2.dev268+g026928a.d20230117'
__version_tuple__ = version_tuple = (2, 0, 2, 'dev268', 'g026928a.d20230117')
...@@ -3,4 +3,4 @@ from os import path ...@@ -3,4 +3,4 @@ from os import path
file_path = path.abspath(__file__) file_path = path.abspath(__file__)
tests_path = path.join(path.abspath(path.dirname(file_path)), "tests") 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=zolfa.nd2reader", tests_path])
...@@ -3,10 +3,10 @@ from os import path ...@@ -3,10 +3,10 @@ from os import path
import six import six
import struct import struct
from nd2reader.artificial import ArtificialND2 from zolfa.nd2reader.artificial import ArtificialND2
from nd2reader.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \ from zolfa.nd2reader.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_unsigned_int, _parse_unsigned_long, _parse_double, check_or_make_dir
from nd2reader.exceptions import InvalidVersionError from zolfa.nd2reader.exceptions import InvalidVersionError
class TestArtificial(unittest.TestCase): class TestArtificial(unittest.TestCase):
......
...@@ -5,11 +5,11 @@ import array ...@@ -5,11 +5,11 @@ import array
import six import six
import struct import struct
from nd2reader.artificial import ArtificialND2 from zolfa.nd2reader.artificial import ArtificialND2
from nd2reader.common import get_version, parse_version, parse_date, _add_to_metadata, _parse_unsigned_char, \ from zolfa.nd2reader.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, \ _parse_unsigned_int, _parse_unsigned_long, _parse_double, check_or_make_dir, _parse_string, _parse_char_array, \
get_from_dict_if_exists, read_chunk get_from_dict_if_exists, read_chunk
from nd2reader.exceptions import InvalidVersionError from zolfa.nd2reader.exceptions import InvalidVersionError
class TestCommon(unittest.TestCase): class TestCommon(unittest.TestCase):
......
import unittest import unittest
from nd2reader.label_map import LabelMap from zolfa.nd2reader.label_map import LabelMap
from nd2reader.artificial import ArtificialND2 from zolfa.nd2reader.artificial import ArtificialND2
class TestLabelMap(unittest.TestCase): class TestLabelMap(unittest.TestCase):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment