cellfinder 0.7.1__tar.gz → 0.8.0__tar.gz

{cellfinder-0.7.1/cellfinder.egg-info → cellfinder-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cellfinder
-Version: 0.7.1
+Version: 0.8.0
 Summary: Automated 3D cell detection and registration of whole-brain images
 Author: Christian Niedworok, Charly Rousseau
 Author-email: Adam Tyson <code@adamltyson.com>
@@ -48,11 +48,35 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: brainreg>=1.0.0
+Requires-Dist: cellfinder-core>=0.2.4
+Requires-Dist: configobj
+Requires-Dist: fancylog>=0.0.7
+Requires-Dist: imio
+Requires-Dist: brainglobe-utils>=0.2.5
+Requires-Dist: multiprocessing-logging>=0.3.4
+Requires-Dist: natsort
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: packaging
+Requires-Dist: scikit-image
+Requires-Dist: tifffile
+Requires-Dist: tqdm
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: gitpython; extra == "dev"
+Requires-Dist: coverage>=5.0.3; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: setuptools_scm; extra == "dev"
 Provides-Extra: napari
-License-File: LICENSE
+Requires-Dist: napari[pyside2]; extra == "napari"
+Requires-Dist: brainglobe-napari-io; extra == "napari"
+Requires-Dist: cellfinder-napari; extra == "napari"
 
 [![Python Version](https://img.shields.io/pypi/pyversions/cellfinder.svg)](https://pypi.org/project/cellfinder)
 [![PyPI](https://img.shields.io/pypi/v/cellfinder.svg)](https://pypi.org/project/cellfinder)

{cellfinder-0.7.1 → cellfinder-0.8.0}/cellfinder/main.py

@@ -42,7 +42,7 @@ def cells_exist(points_file):
 
 def main():
     suppress_tf_logging(tf_suppress_log_messages)
-    from brainreg.main import main as register
+    from brainreg.core.main import main as register
 
     from cellfinder.tools import prep
 

{cellfinder-0.7.1 → cellfinder-0.8.0}/cellfinder/tools/parser.py

@@ -16,8 +16,8 @@ from brainglobe_utils.general.numerical import (
     check_positive_float,
     check_positive_int,
 )
-from brainreg.cli import atlas_parse, geometry_parser, niftyreg_parse
-from brainreg.cli import backend_parse as brainreg_backend_parse
+from brainreg.core.cli import atlas_parse, geometry_parser, niftyreg_parse
+from brainreg.core.cli import backend_parse as brainreg_backend_parse
 from cellfinder_core.download.cli import (
     download_directory_parser,
     model_parser,

{cellfinder-0.7.1 → cellfinder-0.8.0}/cellfinder/tools/prep.py

@@ -14,7 +14,7 @@ from pathlib import PurePath
 from bg_atlasapi import BrainGlobeAtlas
 from brainglobe_utils.general.exceptions import CommandLineInputError
 from brainglobe_utils.general.system import ensure_directory_exists
-from brainreg.paths import Paths as BrainRegPaths
+from brainreg.core.paths import Paths as BrainRegPaths
 from fancylog import fancylog
 
 import cellfinder as program_for_log

{cellfinder-0.7.1 → cellfinder-0.8.0}/cellfinder/tools/tools.py

@@ -80,9 +80,9 @@ def get_number_of_bins_nd(array_size, binning):
     :param binning: How many pixels in each edge of nD equal sized bins
     :return:
     """
-    if type(array_size) is tuple:
+    if isinstance(array_size, tuple):
         bins = [int(size / binning) for size in array_size]
-    elif type(array_size) is dict:
+    elif isinstance(array_size, dict):
         bins = [int(size / binning) for size in array_size.values()]
     else:
         raise NotImplementedError(

{cellfinder-0.7.1 → cellfinder-0.8.0/cellfinder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cellfinder
-Version: 0.7.1
+Version: 0.8.0
 Summary: Automated 3D cell detection and registration of whole-brain images
 Author: Christian Niedworok, Charly Rousseau
 Author-email: Adam Tyson <code@adamltyson.com>
@@ -48,11 +48,35 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: brainreg>=1.0.0
+Requires-Dist: cellfinder-core>=0.2.4
+Requires-Dist: configobj
+Requires-Dist: fancylog>=0.0.7
+Requires-Dist: imio
+Requires-Dist: brainglobe-utils>=0.2.5
+Requires-Dist: multiprocessing-logging>=0.3.4
+Requires-Dist: natsort
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: packaging
+Requires-Dist: scikit-image
+Requires-Dist: tifffile
+Requires-Dist: tqdm
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: gitpython; extra == "dev"
+Requires-Dist: coverage>=5.0.3; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: setuptools_scm; extra == "dev"
 Provides-Extra: napari
-License-File: LICENSE
+Requires-Dist: napari[pyside2]; extra == "napari"
+Requires-Dist: brainglobe-napari-io; extra == "napari"
+Requires-Dist: cellfinder-napari; extra == "napari"
 
 [![Python Version](https://img.shields.io/pypi/pyversions/cellfinder.svg)](https://pypi.org/project/cellfinder)
 [![PyPI](https://img.shields.io/pypi/v/cellfinder.svg)](https://pypi.org/project/cellfinder)

{cellfinder-0.7.1 → cellfinder-0.8.0}/cellfinder.egg-info/requires.txt

@@ -1,4 +1,4 @@
-brainreg
+brainreg>=1.0.0
 cellfinder-core>=0.2.4
 configobj
 fancylog>=0.0.7

{cellfinder-0.7.1 → cellfinder-0.8.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "cellfinder"
 description = "Automated 3D cell detection and registration of whole-brain images"
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     { name = "Adam Tyson", email = "code@adamltyson.com" },
     { name = "Christian Niedworok" },
@@ -22,7 +22,7 @@ classifiers = [
     "Intended Audience :: Science/Research",
 ]
 dependencies = [
-    "brainreg",
+    "brainreg>=1.0.0",
     "cellfinder-core>=0.2.4",
     "configobj",
     "fancylog>=0.0.7",