Skip to content

Commit

Permalink
move dunamai to dev deps and update try block
Browse files Browse the repository at this point in the history
  • Loading branch information
d33bs committed Dec 20, 2023
1 parent 6420cd2 commit 540904f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions cytotable/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,17 @@ def _get_cytotable_version() -> str:
A string representing the version of CytoTable currently being used.
"""

import dunamai

import cytotable

try:
# attempt to gather the development version from dunamai
# for scenarios where cytotable from source is used.
import dunamai

return dunamai.Version.from_any_vcs().serialize()
except RuntimeError:
except (RuntimeError, ModuleNotFoundError):
# else grab a static version from __init__.py
# for scenarios where the built/packaged cytotable is used.
import cytotable

return cytotable.__version__


Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pyarrow = ">=13.0.0"
cloudpathlib = {extras = ["all"], version = "^0.15.0"}
duckdb = ">=0.8.0"
parsl = ">=2023.9.25"
dunamai = "^1.19.0"

[tool.poetry.dev-dependencies]
pytest = "^7.4.0"
Expand All @@ -40,8 +39,7 @@ moto = {extras = ["s3", "server"], version = "^4.0.0"}
cffconvert = "^2.0.0"
cytominer-database = "^0.3.4"
pycytominer = { git = "https://github.com/cytomining/pycytominer.git", rev = "09b2c79aa94908e3520f0931a844db4fba7fd3fb" }


dunamai = "^1.19.0"

[tool.vulture]
min_confidence = 80
Expand Down

0 comments on commit 540904f

Please sign in to comment.