diff --git a/README.md b/README.md index fb7aac8..d541ecd 100644 --- a/README.md +++ b/README.md @@ -104,8 +104,8 @@ subdir: osx-64 **From Python code** ```python -from rptools.rpscore import predict_score -from rptools.rplibs import rpPathway +from rpscore import predict_score +from rplibs import rpPathway pathway = rpPathway( infile='tests/rpscore/data/pathway.xml' @@ -115,7 +115,7 @@ global_score = predict_score(pathway) ``` **From CLI** ```sh -python -m rptools.rpscore +python -m rpscore ``` ## Tests diff --git a/environment-dev.yaml b/environment-dev.yaml index 026c6bf..8656ce9 100644 --- a/environment-dev.yaml +++ b/environment-dev.yaml @@ -1,4 +1,4 @@ -name: rpfba +name: rpscore channels: - conda-forge - nodefaults diff --git a/rpscore/__main__.py b/rpscore/__main__.py index 38100b2..b38e40d 100644 --- a/rpscore/__main__.py +++ b/rpscore/__main__.py @@ -1,7 +1,9 @@ from os import path as os_path, makedirs as os_makedirs from .rpscore import predict_score, ThermoError, FBAError from .Args import add_arguments +from ._version import __version__ from brs_utils import ( + init as init_logger, build_args_parser, ) from rplibs import rpPathway @@ -16,9 +18,7 @@ def entry_point(): ) args = parser.parse_args() - from rptools.__main__ import init - - logger = init(parser, args) + logger = init_logger(parser, args, __version__) pathway = rpPathway(infile=args.infile, logger=logger)