Skip to content

Commit

Permalink
relative imports fixed + version changes
Browse files Browse the repository at this point in the history
  • Loading branch information
phil committed Apr 1, 2021
1 parent 27f53fe commit ab4f84b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions pyometiff/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from omereader import OMETIFFReader
from omewriter import OMETIFFWriter
from omexml import OMEXML
from pyometiff.omereader import OMETIFFReader
from pyometiff.omewriter import OMETIFFWriter
from pyometiff.omexml import OMEXML

__version__ = "0.0.1"
__version__ = "0.0.2"
2 changes: 1 addition & 1 deletion pyometiff/omereader.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import pathlib
from lxml import etree as ET

from omexml import OMEXML
from pyometiff.omexml import OMEXML

import tifffile
import numpy as np
Expand Down
4 changes: 2 additions & 2 deletions pyometiff/omewriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from lxml import etree as ET
import numpy as np
import tifffile
from omexml import OMEXML, get_pixel_type
from pyometiff.omexml import OMEXML, get_pixel_type

BYTE_BOUNDARY = 2 ** 21

Expand Down Expand Up @@ -234,4 +234,4 @@ def _adjust_dims(array, dimension_order):
elif first2 == "CZ" or first2 == "ZC":
dimension_order = "T" + dimension_order

return array, dimension_order
return array, dimension_order
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
name="pyometiff",
version=__version__,
description="Read and Write OME-TIFFs in Python",
packages=find_packages("pyometiff"),
packages=find_packages(exclude=("tests",)),
# py_modules = ["omereader", "omewriter", "omexml"],
package_dir = {"": "pyometiff"},
# package_dir = {"": "pyometiff"},
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
Expand All @@ -22,9 +22,10 @@
long_description=long_description,
long_description_content_type="text/markdown",
install_requires=["numpy",
"tifffile>2020.10.1"],
"tifffile>2020.10.1",
"lxml"],
extras_require={
"dev": ["pytest>3.7",],
"dev": ["pytest>3.7","mock"],
},
url="https://github.com/filippocastelli/pyometiff",
author="Filippo Maria Castelli",
Expand Down

0 comments on commit ab4f84b

Please sign in to comment.