Merge pull request #33 from scverse/Ori-updates2

fix: remove deps of ContextualVersionConflict

Author: ori-kron-wis

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.10", "3.11", "3.12"]
+                python-version: ["3.11", "3.12", "3.13"]
 
         steps:
             - uses: actions/checkout@v2

pyproject.toml

@@ -10,9 +10,9 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Science/Research",
   "Natural Language :: English",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: POSIX :: Linux",
   "Topic :: Scientific/Engineering :: Bio-Informatics",
 ]

scvi_colab/_core.py

@@ -40,8 +40,6 @@ def install(
         fixes that are pinned in this function.
     """
 
-    from pkg_resources import ContextualVersionConflict
-
     if not run_outside_colab:
         IN_COLAB = "google.colab" in sys.modules
         if not IN_COLAB:
@@ -98,10 +96,16 @@ def install(
 
     try:
         import scvi  # noqa: F401
-    except ContextualVersionConflict:
-        logger.warning(
-            "Import unsuccessful. Try restarting (not resetting) the session and running again."
-        )
+    except Exception as exc:
+        if any(
+            base.__name__ == "ContextualVersionConflict"
+            for base in exc.__class__.__mro__
+        ):
+            logger.warning(
+                "Import unsuccessful. Try restarting (not resetting) the session and running again."
+            )
+        else:
+            raise
 
 
 def _run_command(command: str):