Skip to content

Commit

Permalink
forgot to add version.py
Browse files Browse the repository at this point in the history
  • Loading branch information
carsen-stringer committed Jan 12, 2023
1 parent 45673b4 commit 0ddcaf9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion cellpose/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from cellpose.version import version
from cellpose.version import version, version_str
12 changes: 2 additions & 10 deletions cellpose/__main__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import sys, os, argparse, glob, pathlib, time
from platform import python_version
import numpy as np
from natsort import natsorted
from tqdm import tqdm
import torch
from cellpose import utils, models, io, core, version
from cellpose import utils, models, io, core, version_str

try:
from cellpose.gui import gui
Expand Down Expand Up @@ -128,11 +126,7 @@ def main():

args = parser.parse_args()

version_str = f"""
cellpose version: \t{version}
platform: \t{sys.platform}
python version: \t{python_version()}
torch version: \t{torch.__version__}"""

if args.version:
print(version_str)
return
Expand Down Expand Up @@ -163,8 +157,6 @@ def main():
print('No --verbose => no progress or info printed')
logger = logging.getLogger(__name__)

logger.info(version_str)

use_gpu = False
channels = [args.chan, args.chan2]

Expand Down
2 changes: 2 additions & 0 deletions cellpose/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import logging, pathlib, sys
from tqdm import tqdm
from pathlib import Path
from . import version_str


try:
Expand Down Expand Up @@ -47,6 +48,7 @@ def logger_setup():
)
logger = logging.getLogger(__name__)
logger.info(f'WRITING LOG OUTPUT TO {log_file}')
logger.info(version_str)
#logger.handlers[1].stream = sys.stdout

return logger, log_file
Expand Down
15 changes: 15 additions & 0 deletions cellpose/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from importlib.metadata import PackageNotFoundError, version
import sys
from platform import python_version
import torch

try:
version = version("cellpose")
except PackageNotFoundError:
version = 'unknown'

version_str = f"""
cellpose version: \t{version}
platform: \t{sys.platform}
python version: \t{python_version()}
torch version: \t{torch.__version__}"""

0 comments on commit 0ddcaf9

Please sign in to comment.