spacr 0.2.4__tar.gz → 0.2.8__tar.gz

{spacr-0.2.4/spacr.egg-info → spacr-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.2.4
+Version: 0.2.8
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -9,10 +9,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
-Requires-Dist: torch<3.0,>=2.2.1
-Requires-Dist: torchvision<1.0,>=0.17.1
-Requires-Dist: torch-geometric<3.0,>=2.5.1
+Requires-Dist: torch<3.0,>=2.0
+Requires-Dist: torchvision<1.0,>=0.1
+Requires-Dist: torch-geometric<3.0,>=2.5
 Requires-Dist: numpy<2.0,>=1.26.4
+Requires-Dist: bottleneck<2.0,>=1.3.6
+Requires-Dist: numexpr<3.0,>=2.8.4
 Requires-Dist: pandas<3.0,>=2.2.1
 Requires-Dist: statsmodels<1.0,>=0.14.1
 Requires-Dist: scikit-image<1.0,>=0.22.0
@@ -39,6 +41,15 @@ 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: tables<4.0,>=3.8.0
+Requires-Dist: rapidfuzz<4.0,>=3.9
+Requires-Dist: keyring<16.0,>=15.1
+Requires-Dist: screeninfo<1.0,>=0.8.1
+Requires-Dist: ipykernel
 Requires-Dist: huggingface-hub<0.25,>=0.24.0
 Provides-Extra: dev
 Requires-Dist: pytest<3.11,>=3.9; extra == "dev"

{spacr-0.2.4 → spacr-0.2.8}/setup.py

@@ -1,24 +1,17 @@
 from setuptools import setup, find_packages
 import subprocess
 
-# Function to determine the CUDA version
-def get_cuda_version():
-    try:
-        output = subprocess.check_output(['nvcc', '--version'], stderr=subprocess.STDOUT).decode('utf-8')
-        if 'release' in output:
-            return output.split('release ')[1].split(',')[0].replace('.', '')
-    except (subprocess.CalledProcessError, FileNotFoundError):
-        return None
-
 # Ensure you have read the README.rst content into a variable, e.g., `long_description`
 with open("README.rst", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 dependencies = [
-    'torch>=2.2.1,<3.0',
-    'torchvision>=0.17.1,<1.0',
-    'torch-geometric>=2.5.1,<3.0',
+    'torch>=2.0,<3.0',
+    'torchvision>=0.1,<1.0',
+    'torch-geometric>=2.5,<3.0',
     'numpy>=1.26.4,<2.0',
+    'bottleneck>=1.3.6,<2.0',
+    'numexpr>=2.8.4,<3.0',
     'pandas>=2.2.1,<3.0',
     'statsmodels>=0.14.1,<1.0',
     'scikit-image>=0.22.0,<1.0',
@@ -45,12 +38,21 @@ 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',
+    'tables>=3.8.0,<4.0',
+    'rapidfuzz>=3.9, <4.0',
+    'keyring>=15.1, <16.0',
+    'screeninfo>=0.8.1,<1.0',
+    'ipykernel',
     'huggingface-hub>=0.24.0,<0.25'
 ]
 
 setup(
     name="spacr",
-    version="0.2.4",
+    version="0.2.8",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",
@@ -58,7 +60,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': [
@@ -83,17 +85,6 @@ setup(
     ]
 )
 
-cuda_version = get_cuda_version()
-
-if cuda_version:
-    dgl = f'dgl-cu{cuda_version}==0.9.1'
-else:
-    dgl = 'dgl==0.9.1'  # Fallback to CPU version if no CUDA is detected
-try:
-    subprocess.run(['pip', 'install', dgl], check=True)
-except subprocess.CalledProcessError:
-    subprocess.run(['pip', 'install', 'dgl'], check=True)
-
 deps = ['pyqtgraph>=0.13.7,<0.14',
         'pyqt6>=6.7.1,<6.8',
         'pyqt6.sip',

{spacr-0.2.4 → spacr-0.2.8}/spacr/__init__.py

@@ -17,7 +17,6 @@ from . import gui_utils
 from . import gui_elements
 from . import gui_core
 from . import gui
-from . import gui
 from . import app_make_masks
 from . import app_mask
 from . import app_measure
@@ -35,7 +34,7 @@ __all__ = [
     "plot",
     "measure",
     "sim",
-    "sequencing"
+    "sequencing",
     "timelapse",
     "deep_spacr",
     "app_annotate",
@@ -43,7 +42,6 @@ __all__ = [
     "gui_elements",
     "gui_core",
     "gui",
-    "gui",
     "app_make_masks",
     "app_mask",
     "app_measure",
@@ -53,13 +51,5 @@ __all__ = [
     "logger"
 ]
 
-# Check for CUDA GPU availability
-if torch.cuda.is_available():
-    from . import graph_learning
-    __all__.append("graph_learning")
-    logging.info("CUDA GPU detected. Graph learning module loaded.")
-else:
-    logging.info("No CUDA GPU detected. Graph learning module not loaded.")
-
 logging.basicConfig(filename='spacr.log', level=logging.INFO,
                     format='%(asctime)s:%(levelname)s:%(message)s')