Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
extend-ignore = E203,E501
exclude = .git,__pycache__,docs/source/conf.py,old,build,dist
max-complexity = 10
6 changes: 3 additions & 3 deletions .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: build_and_test

on:
push:
branches:
branches:
- master
workflow_dispatch:

jobs:
build_and_test:
runs-on: ubuntu-20.04
timeout-minutes: 60
timeout-minutes: 60
steps:
- uses: actions/checkout@v2
- name: Setup conda, install packages, and test celloracle
Expand All @@ -29,7 +29,7 @@ jobs:
# command to install dependencies
conda activate test-environment
conda install cython numpy pytest

# Check pip
echo pip_path
which pip
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/build_weekly_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build_and_test:
runs-on: ubuntu-20.04
timeout-minutes: 60
timeout-minutes: 60
steps:
- uses: actions/checkout@v2
- name: Setup conda, install packages, and test celloracle
Expand All @@ -28,13 +28,13 @@ jobs:
# command to install dependencies
conda activate test-environment
conda install cython numpy pytest

conda list
ls /home/runner/miniconda
ls /home/runner/miniconda/bin

python --version

which pip
#Install fa2 for tutorial
pip install fa2
Expand All @@ -44,5 +44,3 @@ jobs:
pip install .
# command to run tests
pytest -v


24 changes: 24 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 22.8.0
hooks:
- id: black
#- repo: https://github.com/PyCQA/flake8
# rev: 5.0.4
# hooks:
# - id: flake8
# additional_dependencies:
# - Flake8-pyproject
# - flake8-bugbear
# - flake8-comprehensions
# - flake8-executable
# - mccabe
56 changes: 36 additions & 20 deletions celloracle/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,55 @@
import warnings
import logging

from . import utility, network, network_analysis, go_analysis, data, data_conversion, oracle_utility
from . import (
utility,
network,
network_analysis,
go_analysis,
data,
data_conversion,
oracle_utility,
)
from .trajectory.oracle_core import Oracle
from .network import Net
from .network_analysis import Links
from .utility.load_hdf5 import load_hdf5
from .utility import check_python_requirements
from .network_analysis import test_R_libraries_installation
from .version import __version__
#from . import motif_analysis

# from . import motif_analysis

logger = logging.getLogger(__name__)
logger.addHandler(logging.StreamHandler())
logger.setLevel(logging.INFO)


# Make sure that DeprecationWarning within this package always gets printed
warnings.filterwarnings('always', category=DeprecationWarning,
module=r'^{0}\.'.format(re.escape(__name__)))

__copyright__ = 'Copyright (C) 2020 Kenji Kamimoto'
__license__ = 'Apache License Version 2.0'
__author__ = 'Kenji Kamimoto'
__author_email__ = 'kamimoto@wustl.edu'
__url__ = 'https://github.com/morris-lab/CellOracle'
#__version__ = "0.10.2"
__all__ = ["utility", "motif_analysis", "network", "network_analysis",
"go_analysis", "data", "data_conversion",
"Oracle",
"Links",
"Net",
"load_hdf5",
"test_R_libraries_installation",
"check_python_requirements"
]
warnings.filterwarnings(
"always", category=DeprecationWarning, module=r"^{0}\.".format(re.escape(__name__))
)

__copyright__ = "Copyright (C) 2020 Kenji Kamimoto"
__license__ = "Apache License Version 2.0"
__author__ = "Kenji Kamimoto"
__author_email__ = "kamimoto@wustl.edu"
__url__ = "https://github.com/morris-lab/CellOracle"
# __version__ = "0.10.2"
__all__ = [
"utility",
"motif_analysis",
"network",
"network_analysis",
"go_analysis",
"data",
"data_conversion",
"Oracle",
"Links",
"Net",
"load_hdf5",
"test_R_libraries_installation",
"check_python_requirements",
]

check_python_requirements(return_detail=False, print_warning=True)
21 changes: 15 additions & 6 deletions celloracle/applications/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,23 @@

"""

#from .interactive_simulation_and_plot import Oracle_extended, DEFAULT_PARAMETERS
#from .development_analysis import Oracle_development_module, subset_oracle_for_development_analysiis
# from .interactive_simulation_and_plot import Oracle_extended, DEFAULT_PARAMETERS
# from .development_analysis import Oracle_development_module, subset_oracle_for_development_analysiis
from .pseudotime import Pseudotime_calculator
from .differentiation_flow import load_gradient, Gradient_calculator, aggregate_Gradient_objects
from .differentiation_flow import (
load_gradient,
Gradient_calculator,
aggregate_Gradient_objects,
)
from .development_module import Oracle_development_module
from .systematic_analysis_helper import Oracle_systematic_analysis_helper


__all__ = ["Pseudotime_calculator",
"load_gradient", "Gradient_calculator", "aggregate_Gradient_objects",
"Oracle_development_module", "Oracle_systematic_analysis_helper"]
__all__ = [
"Pseudotime_calculator",
"load_gradient",
"Gradient_calculator",
"aggregate_Gradient_objects",
"Oracle_development_module",
"Oracle_systematic_analysis_helper",
]
Loading