cellfinder 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

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/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/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/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.dist-info → cellfinder-0.8.0.dist-info}/METADATA

@@ -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,10 +48,10 @@ 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
+Requires-Dist: brainreg >=1.0.0
 Requires-Dist: cellfinder-core >=0.2.4
 Requires-Dist: configobj
 Requires-Dist: fancylog >=0.0.7

{cellfinder-0.7.1.dist-info → cellfinder-0.8.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cellfinder/__init__.py,sha256=TOTszmwu6-ukckrUEstKsi1A0Yt6aue2P5OPE2NVt0U,203
-cellfinder/main.py,sha256=tMuq_GWHs8dsEew0RwwwKeDsFby9sZXvv5rSE354E5E,7385
+cellfinder/main.py,sha256=pIWLWp-rGp2-xDf6E9ehXyt9mjJMYTW8I0KWjBWCq4o,7390
 cellfinder/analyse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cellfinder/analyse/analyse.py,sha256=8Wf3nUpBqGdu2PuJFIzdHHDnrkSDsk0WZRUj5COCaM0,11010
 cellfinder/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,13 +13,13 @@ cellfinder/figures/figures.py,sha256=ughsNeTM6YnBtRakNfMB_jmPOTzaOgpqFdb28SZH4Ts
 cellfinder/figures/heatmap.py,sha256=ayKbv-vDhnpdv5vYIayEwzDmU_rmyzPQ7TknRvcouec,1951
 cellfinder/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cellfinder/tools/image_processing.py,sha256=z27bGjf3Iv3G4Nt1OYzpEnIYQNc4nNomj_QitqvZB78,2269
-cellfinder/tools/parser.py,sha256=1kwryFA7hEBKrsbXkW0iEl03AAGqi4Ss7RkCkv9-l_c,13567
-cellfinder/tools/prep.py,sha256=bCEdUCsq_1sew_owuCCtEPn3YlEvTRu9WbePLzqGUk4,11119
+cellfinder/tools/parser.py,sha256=7FJFUi3OJcSpuXm1ikZIJIFen2_Y8FtI-13T-ZIzGiI,13577
+cellfinder/tools/prep.py,sha256=7SqxBdzP4U3tH4oWkYo7vnC79tgqLS5PTDW-KWwjyt4,11124
 cellfinder/tools/system.py,sha256=6iSOLrz2mtKgOIdwjp_VS0-74XQCuaQYCvWAViJgEus,2232
-cellfinder/tools/tools.py,sha256=0HqnTg0S1avKMQtb2SkiG43jvLTa-QhxNlujvztpubI,3627
-cellfinder-0.7.1.dist-info/LICENSE,sha256=zyXpitCrNwvc33VKBFomd9v6Ahi9x1H5fvfXDxCblM0,1525
-cellfinder-0.7.1.dist-info/METADATA,sha256=GzaIqCrsGAmKt1s24VnidfuxXzdqVM13Tuzwz2fzi5o,11626
-cellfinder-0.7.1.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-cellfinder-0.7.1.dist-info/entry_points.txt,sha256=n3M2y93q1QNL0MnYqyaJ5yWl8j4YJ-OHitghTwiGuvk,52
-cellfinder-0.7.1.dist-info/top_level.txt,sha256=jyTQzX-tDjbsMr6s-E71Oy0IKQzmHTXSk4ZhpG5EDSE,11
-cellfinder-0.7.1.dist-info/RECORD,,
+cellfinder/tools/tools.py,sha256=Km4Y1p3yQOYi_dyTOZthJXcvUintIzTUYwDkuXGNc0A,3635
+cellfinder-0.8.0.dist-info/LICENSE,sha256=zyXpitCrNwvc33VKBFomd9v6Ahi9x1H5fvfXDxCblM0,1525
+cellfinder-0.8.0.dist-info/METADATA,sha256=LiFR_CUo5hxSYUBO4Un2NrdWc50ymOuym472Syi63ss,11634
+cellfinder-0.8.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+cellfinder-0.8.0.dist-info/entry_points.txt,sha256=n3M2y93q1QNL0MnYqyaJ5yWl8j4YJ-OHitghTwiGuvk,52
+cellfinder-0.8.0.dist-info/top_level.txt,sha256=jyTQzX-tDjbsMr6s-E71Oy0IKQzmHTXSk4ZhpG5EDSE,11
+cellfinder-0.8.0.dist-info/RECORD,,

{cellfinder-0.7.1.dist-info → cellfinder-0.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any