prepare hard fork

pyproject.toml

@@ -0,0 +1,10 @@
+[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"

setup.cfg

@@ -1,5 +1,42 @@
 [metadata]
+name = zolfa-nd2reader
+version = attr:zolfa.nd2reader.version
+description = A tool for reading ND2 files produced by NIS Elements
 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]
 universal=1

setup.py

@@ -1,31 +0,0 @@
-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',
-                     ]
-    )

sphinx/conf.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import sphinx_bootstrap_theme
 from recommonmark.parser import CommonMarkParser
-from nd2reader import __version__ as VERSION
+from zolfa.nd2reader.version import __version__ as VERSION
 
 # -- General configuration ------------------------------------------------
 
@@ -36,9 +36,9 @@ source_suffix = ['.rst', '.md']
 master_doc = 'index'
 
 # General information about the project.
-project = 'nd2reader'
+project = 'zolfa-nd2reader'
 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
 # |version| and |release|, also used in various other places throughout the

src/zolfa/nd2reader/version.py

@@ -0,0 +1,4 @@
+# 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')

test.py

@@ -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=zolfa.nd2reader", tests_path])

tests/test_artificial.py

@@ -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 zolfa.nd2reader.artificial import ArtificialND2
+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
-from nd2reader.exceptions import InvalidVersionError
+from zolfa.nd2reader.exceptions import InvalidVersionError
 
 
 class TestArtificial(unittest.TestCase):

tests/test_common.py

@@ -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 zolfa.nd2reader.artificial import ArtificialND2
+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, \
     get_from_dict_if_exists, read_chunk
-from nd2reader.exceptions import InvalidVersionError
+from zolfa.nd2reader.exceptions import InvalidVersionError
 
 
 class TestCommon(unittest.TestCase):

tests/test_label_map.py

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

tests/test_legacy.py

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

tests/test_parser.py

@@ -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 zolfa.nd2reader.artificial import ArtificialND2
+from zolfa.nd2reader.common import check_or_make_dir
+from zolfa.nd2reader.parser import Parser
 import urllib.request
 
 

tests/test_raw_metadata.py

@@ -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 zolfa.nd2reader.artificial import ArtificialND2
+from zolfa.nd2reader.label_map import LabelMap
+from zolfa.nd2reader.raw_metadata import RawMetadata
+from zolfa.nd2reader.common_raw_metadata import parse_roi_shape, parse_roi_type, parse_dimension_text_line
 
 
 class TestRawMetadata(unittest.TestCase):

tests/test_reader.py

@@ -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 zolfa.nd2reader.artificial import ArtificialND2
+from zolfa.nd2reader.exceptions import EmptyFileError, InvalidFileType
+from zolfa.nd2reader.reader import ND2Reader
+from zolfa.nd2reader.parser import Parser
 
 
 class TestReader(unittest.TestCase):

tests/test_version.py

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