Skip to content

Commit

Permalink
Update packages that are shipped (#37)
Browse files Browse the repository at this point in the history
* Ship brainrender. Remove conda-checks that are currently not used, as we're not on conda

* Add brainrender-napari

* Remove morphapi
  • Loading branch information
willGraham01 authored Jan 3, 2024
1 parent 337f118 commit 8b5112a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 100 deletions.
20 changes: 1 addition & 19 deletions brainglobe/__init__.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
from importlib.metadata import PackageNotFoundError, version

from ._conda_handles import _CELLFINDER_INSTALLED, _MORPHAPI_INSTALLED

try:
__version__ = version("brainglobe")
except PackageNotFoundError:
except PackageNotFoundError as e:
# package is not installed
pass

# Expose tools under the brainglobe namespace
import bg_atlasapi
import bg_space
import brainreg
import brainglobe_segmentation

# Expose tools that may not be present
# if a conda install was performed
if _MORPHAPI_INSTALLED:
# Import morphapi
import morphapi

# cellfinder and associated packages
if _CELLFINDER_INSTALLED:
import cellfinder_core
16 changes: 0 additions & 16 deletions brainglobe/_conda_handles.py

This file was deleted.

17 changes: 9 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@ classifiers = [
]

dependencies = [
"napari[all]",
"bg-atlasapi>=1.0.0",
"bg-space>=0.5.0",
"brainglobe-napari-io",
"brainglobe-segmentation>=1.0.0",
"brainglobe-utils",
"bg-atlasapi>=1.0.0",
"brainreg[napari]>=1.0.0",
# brainglobe-napari [WIP],
"imio",
"brainrender>=2.1.0",
"brainrender-napari",
"cellfinder-core>=0.3",
"morphapi>=0.1.3.0",
"brainglobe-napari-io",
# bg-atlasgen [LOCAL ONLY],
"brainglobe-segmentation>=1.0.0",
"cellfinder-napari",
"cellfinder",
"imio",
"napari[all]",
# bg-atlasgen [LOCAL ONLY],
# brainglobe-napari [WIP],
]

[project.optional-dependencies]
Expand Down
57 changes: 0 additions & 57 deletions tests/test_unit/test_tool_exposure.py

This file was deleted.

0 comments on commit 8b5112a

Please sign in to comment.