spacr 0.2.3__tar.gz → 0.2.5__tar.gz

{spacr-0.2.3/spacr.egg-info → spacr-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.2.3
+Version: 0.2.5
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -39,6 +39,10 @@ Requires-Dist: ttf_opensans>=2020.10.30
 Requires-Dist: customtkinter<6.0,>=5.2.2
 Requires-Dist: biopython<2.0,>=1.80
 Requires-Dist: lxml<6.0,>=5.1.0
+Requires-Dist: psutil<6.0,>=5.9.8
+Requires-Dist: gputil<2.0,>=1.4.0
+Requires-Dist: gpustat<2.0,>=1.1.1
+Requires-Dist: pyautogui<1.0,>=0.9.54
 Requires-Dist: huggingface-hub<0.25,>=0.24.0
 Provides-Extra: dev
 Requires-Dist: pytest<3.11,>=3.9; extra == "dev"

{spacr-0.2.3 → spacr-0.2.5}/setup.py

@@ -45,12 +45,16 @@ dependencies = [
     'customtkinter>=5.2.2,<6.0', 
     'biopython>=1.80,<2.0',
     'lxml>=5.1.0,<6.0',
+    'psutil>=5.9.8, <6.0',
+    'gputil>=1.4.0, <2.0', 
+    'gpustat>=1.1.1,<2.0',
+    'pyautogui>=0.9.54,<1.0',
     'huggingface-hub>=0.24.0,<0.25'
 ]
 
 setup(
     name="spacr",
-    version="0.2.3",
+    version="0.2.5",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",
@@ -58,7 +62,7 @@ setup(
     url="https://github.com/EinarOlafsson/spacr",
     packages=find_packages(exclude=["tests.*", "tests"]),
     include_package_data=True,
-    package_data={'spacr': ['resources/models/cp/*', 'resources/icons/*'],},
+    package_data={'spacr': ['resources/models/cp/*', 'resources/icons/*', 'resources/font/**/*'],},
     install_requires=dependencies,
     entry_points={
         'console_scripts': [

{spacr-0.2.3 → spacr-0.2.5}/spacr/app_annotate.py

@@ -1,7 +1,7 @@
 import tkinter as tk
 from tkinter import ttk
 from .gui import MainApp
-from .gui_elements import set_dark_style
+from .gui_elements import set_dark_style, spacrButton
 
 def initiate_annotation_app(parent_frame):
     from .gui_utils import generate_annotate_fields, annotate_app
@@ -20,8 +20,6 @@ def initiate_annotation_app(parent_frame):
         settings['img_size'] = list(map(int, settings['img_size'].split(',')))  # Convert string to list of integers
         settings['percentiles'] = list(map(int, settings['percentiles'].split(',')))  # Convert string to list of integers
         settings['normalize'] = settings['normalize'].lower() == 'true'
-        settings['rows'] = int(settings['rows'])
-        settings['columns'] = int(settings['columns'])
 
         try:
             settings['measurement'] = settings['measurement'].split(',') if settings['measurement'] else None
@@ -40,9 +38,10 @@ def initiate_annotation_app(parent_frame):
                 settings[key] = None
 
         settings_window.destroy()
+
         annotate_app(parent_frame, settings)
     
-    start_button = tk.Button(settings_window, text="Start Annotation", command=start_annotation_app, bg=style_out['bg_color'], fg=style_out['bg_color'])
+    start_button = spacrButton(settings_window, text="annotate", command=start_annotation_app, show_text=False)
     start_button.pack(pady=10)
 
 def start_annotate_app():