Skip to content

Commit

Permalink
Merge pull request #171 from henrypinkard/main
Browse files Browse the repository at this point in the history
Build fixes
  • Loading branch information
henrypinkard authored Jul 26, 2024
2 parents bd7d1e4 + be2afdf commit 82d1d0b
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 47 deletions.
29 changes: 29 additions & 0 deletions python/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion python/ndstorage/old_format_version_readers/nd_tiff_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion python/ndstorage/old_format_version_readers/ndtiff_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[build-system]
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"
Expand All @@ -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"

Expand Down
44 changes: 0 additions & 44 deletions python/setup.py

This file was deleted.

0 comments on commit 82d1d0b

Please sign in to comment.