diff --git a/python/LICENSE b/python/LICENSE new file mode 100644 index 0000000..74f9083 --- /dev/null +++ b/python/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2021, µManager +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/python/ndstorage/old_format_version_readers/nd_tiff_v2.py b/python/ndstorage/old_format_version_readers/nd_tiff_v2.py index fad63a1..fefe09a 100644 --- a/python/ndstorage/old_format_version_readers/nd_tiff_v2.py +++ b/python/ndstorage/old_format_version_readers/nd_tiff_v2.py @@ -9,7 +9,7 @@ import warnings import struct import threading -from .file_io import NDTiffFileIO, BUILTIN_FILE_IO +from ..file_io import NDTiffFileIO, BUILTIN_FILE_IO _POSITION_AXIS = "position" _ROW_AXIS = "row" diff --git a/python/ndstorage/old_format_version_readers/ndtiff_v1.py b/python/ndstorage/old_format_version_readers/ndtiff_v1.py index 48f4a1c..dabbb80 100644 --- a/python/ndstorage/old_format_version_readers/ndtiff_v1.py +++ b/python/ndstorage/old_format_version_readers/ndtiff_v1.py @@ -8,7 +8,7 @@ import dask.array as da import warnings import struct -from .file_io import NDTiffFileIO, BUILTIN_FILE_IO +from ..file_io import NDTiffFileIO, BUILTIN_FILE_IO class _MultipageTiffReader: # Class corresponsing to a single multipage tiff file in a Micro-Magellan dataset. Pass the full path of the TIFF to diff --git a/python/pyproject.toml b/python/pyproject.toml index 0aaca4d..94f1f78 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,4 +1,3 @@ - [build-system] requires = ["flit_core >=3.2,<4"] build-backend = "flit_core.buildapi" @@ -11,12 +10,14 @@ classifiers = [ "License :: OSI Approved :: BSD License", "Operating System :: OS Independent" ] + dependencies = [ "numpy", "sortedcontainers", "dask[array]>=2022.2.0" ] dynamic = ["version"] + description = "N-dimensional, multiresolution file format for Micro-Manager" readme = "README.md" diff --git a/python/setup.py b/python/setup.py deleted file mode 100644 index da4ff2f..0000000 --- a/python/setup.py +++ /dev/null @@ -1,44 +0,0 @@ -import setuptools -from os import path - -with open("README.md", "r") as fh: - long_description = fh.read() - -# extract version -path = path.realpath("ndstorage/_version.py") -version_ns = {} -with open(path, encoding="utf8") as f: - exec(f.read(), {}, version_ns) -version = version_ns["__version__"] - -with open("requirements.txt") as f: - requirements = f.read().splitlines() - -setuptools.setup( - name="ndstorage", - version=version, - author="Henry Pinkard", - author_email="henry.pinkard@gmail.com", - description="Python libraries for N-dimensional datasets, including NDTiff", - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/micro-manager/NDStorage", - packages=setuptools.find_packages(), - install_requires=requirements, - python_requires=">=3.6", - extras_require={ - "test": [ - "pytest", - ] - }, - classifiers=[ - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Development Status :: 5 - Production/Stable", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - ], -)