Skip to content

Commit

Permalink
isort, warn from tight_layout
Browse files Browse the repository at this point in the history
  • Loading branch information
horta committed Apr 16, 2019
1 parent 4a62489 commit 55fc1ba
Show file tree
Hide file tree
Showing 43 changed files with 109 additions and 70 deletions.
4 changes: 1 addition & 3 deletions limix/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
The official documentation together with examples and tutorials can be found
at https://limix.readthedocs.io/.
"""
from . import __config__

from . import vardec, her, io, plot, qc, qtl, sh, stats, threads
from . import __config__, her, io, plot, qc, qtl, sh, stats, threads, vardec
from ._cli import cli
from ._config import config
from ._example import file_example
Expand Down
2 changes: 1 addition & 1 deletion limix/_cli/_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from .download import download
from .estimate_kinship import estimate_kinship
from .extract import extract
from .remove import remove
from .qtl import qtl
from .remove import remove
from .see import see


Expand Down
1 change: 1 addition & 0 deletions limix/_cli/download.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

import limix


Expand Down
1 change: 1 addition & 0 deletions limix/_cli/estimate_kinship.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

import limix


Expand Down
1 change: 1 addition & 0 deletions limix/_cli/extract.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

import limix


Expand Down
3 changes: 2 additions & 1 deletion limix/_cli/qtl.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import click
from .st_sscan import st_sscan

from .scan import scan
from .st_sscan import st_sscan


# @click.command(cls=OrderedCommand)
Expand Down
3 changes: 2 additions & 1 deletion limix/_cli/remove.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import limix
import click

import limix


@click.command()
@click.pass_context
Expand Down
1 change: 1 addition & 0 deletions limix/_cli/scan.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

from ._click import OrderedCommand


Expand Down
3 changes: 2 additions & 1 deletion limix/_cli/see.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import limix
import click

import limix


@click.command()
@click.pass_context
Expand Down
1 change: 1 addition & 0 deletions limix/_cli/st_sscan.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

from ._click import OrderedCommand


Expand Down
9 changes: 5 additions & 4 deletions limix/_cli/test/test_pipeline.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import os

import limix
from limix._cli.pipeline import Pipeline
from limix._cli.preprocess import normalize, where, impute
from limix.io._fetch import fetch
from numpy import nan
from numpy.random import RandomState
from numpy.testing import assert_allclose

import limix
from limix._cli.pipeline import Pipeline
from limix._cli.preprocess import impute, normalize, where
from limix.io._fetch import fetch


def test_pipeline_where_filter():

Expand Down
3 changes: 2 additions & 1 deletion limix/_data/test/test_data_asarray.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import numpy as np
import pytest
import xarray as xr
from limix._data import asarray
from numpy.testing import assert_array_equal as assert_eq, assert_string_equal

from limix._data import asarray


def test_asarray():
from limix._data._conf import CONF
Expand Down
4 changes: 2 additions & 2 deletions limix/_display/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from ._core import blue, bold, green, red, width
from ._display import add_title_header, banner, indent, session_block, session_line
from ._exception import print_exc
from ._display import banner, session_block, session_line, add_title_header, indent
from ._core import bold, blue, red, green, width

__all__ = [
"print_exc",
Expand Down
3 changes: 2 additions & 1 deletion limix/_display/_exception.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import sys
from ._display import bold, red, pprint

from ._display import bold, pprint, red


def print_exc(stack, e):
Expand Down
2 changes: 1 addition & 1 deletion limix/her/_estimate.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .._display import session_block, session_line
from .._data import conform_dataset, normalize_likelihood
from .._display import session_block, session_line
from ..qc._lik import normalise_extreme_values
from ..qtl._assert import assert_finite

Expand Down
8 changes: 5 additions & 3 deletions limix/io/test/test_fetch.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import limix
from limix.io._fetch import fetch
import pytest
import sys

import pytest
from numpy.testing import (
assert_allclose,
assert_array_equal,
assert_equal,
assert_string_equal,
)

import limix
from limix.io._fetch import fetch

_samples = [
"HG00111",
"HG00112",
Expand Down
3 changes: 1 addition & 2 deletions limix/io/test/test_readers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from numpy.testing import assert_allclose, assert_equal

from limix import io
from limix import file_example
from limix import file_example, io
from limix.sh import extract


Expand Down
4 changes: 2 additions & 2 deletions limix/plot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
from limix_plot import (
ConsensusCurve,
box_aspect,
get_pyplot,
image,
kinship,
load_dataset,
manhattan,
normal,
pca,
power,
qqplot,
image,
get_pyplot,
show,
)

Expand Down
3 changes: 2 additions & 1 deletion limix/qc/_impute.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from limix._bits import dask, get_shape, numpy, pandas, xarray
import warnings

from limix._bits import dask, get_shape, numpy, pandas, xarray


def mean_impute(X, axis=-1, inplace=False):
"""
Expand Down
3 changes: 2 additions & 1 deletion limix/qc/_mean_std.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from limix._bits import dask, numpy, pandas, xarray
import warnings

from limix._bits import dask, numpy, pandas, xarray


def mean_standardize(X, axis=-1, inplace=False):
"""
Expand Down
3 changes: 1 addition & 2 deletions limix/qc/test/test_allele.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import dask.array as da
import xarray as xr
from bgen_reader import allele_expectation, compute_dosage, example_files, read_bgen
from numpy import array_equal, ndarray
from numpy.random import RandomState
from numpy.testing import assert_, assert_allclose
from pandas import DataFrame, Series
from bgen_reader import read_bgen, allele_expectation, example_files
from bgen_reader import compute_dosage

from limix.qc import compute_maf

Expand Down
10 changes: 6 additions & 4 deletions limix/qc/test/test_impute.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import pytest
from limix.qc import mean_impute
from numpy import asarray, nan
from numpy.random import RandomState

from limix.qc import mean_impute

from .util import (
assert_dask_array,
assert_dask_dataframe,
assert_ndarray_1d,
assert_ndarray_2d,
assert_pandas_series,
assert_pandas_dataframe,
assert_dask_array,
assert_dask_dataframe,
assert_pandas_series,
assert_xarray_dataarray,
)

Expand Down
3 changes: 2 additions & 1 deletion limix/qc/test/test_indep_pairwise.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from dask.array import from_array
from limix.qc import indep_pairwise
from numpy.random import RandomState
from numpy.testing import assert_equal

from limix.qc import indep_pairwise


def test_indep_pairwise():
random = RandomState(0)
Expand Down
3 changes: 2 additions & 1 deletion limix/qc/test/test_linalg.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from numpy import zeros, ones
from numpy import ones, zeros
from numpy.random import RandomState
from numpy.testing import assert_allclose

from limix.qc import remove_dependent_cols


Expand Down
13 changes: 7 additions & 6 deletions limix/qc/test/test_mean_standardize.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import pytest
from numpy import nan
from limix.qc import mean_standardize
from numpy import array
from numpy import array, nan
from numpy.random import RandomState

from limix.qc import mean_standardize

from .util import (
assert_dask_array,
assert_dask_dataframe,
assert_ndarray_1d,
assert_ndarray_2d,
assert_pandas_series,
assert_pandas_dataframe,
assert_dask_array,
assert_dask_dataframe,
assert_pandas_series,
assert_xarray_dataarray,
)

Expand Down
5 changes: 3 additions & 2 deletions limix/qc/test/test_missing.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import dask.array as da
from numpy import nan
from numpy.random import RandomState
from numpy.testing import assert_array_equal
from numpy import nan

from limix.qc import count_missingness
import dask.array as da


def test_count_missingness():
Expand Down
10 changes: 6 additions & 4 deletions limix/qc/test/test_quantile_gaussianize.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import pytest
from limix.qc import quantile_gaussianize as qg
from numpy import asarray, nan
from numpy.random import RandomState

from limix.qc import quantile_gaussianize as qg

from .util import (
assert_dask_array,
assert_dask_dataframe,
assert_ndarray_1d,
assert_ndarray_2d,
assert_pandas_series,
assert_pandas_dataframe,
assert_dask_array,
assert_dask_dataframe,
assert_pandas_series,
assert_xarray_dataarray,
)

Expand Down
3 changes: 2 additions & 1 deletion limix/qc/test/test_unique.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import dask.array as da
from numpy.random import RandomState
from numpy.testing import assert_array_equal

from limix.qc import unique_variants
import dask.array as da


def test_unique_variants():
Expand Down
4 changes: 2 additions & 2 deletions limix/qc/test/util.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from numpy.testing import assert_allclose, assert_, assert_array_equal
import xarray as xr
import dask.array as da
import dask.dataframe as dd
import pandas as pd
import xarray as xr
from numpy.testing import assert_, assert_allclose, assert_array_equal


def assert_ndarray_1d(func, data1d):
Expand Down
3 changes: 2 additions & 1 deletion limix/qtl/_iscan.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import sys

from limix._display import session_line

from .._bits import unvec
from .._data import asarray as _asarray, conform_dataset, normalize_likelihood
from .._display import session_block
from ._result import IScanResultFactory
from ._assert import assert_finite
from ._result import IScanResultFactory


def iscan(G, y, lik="normal", K=None, M=None, idx=None, E0=None, E1=None, verbose=True):
Expand Down
4 changes: 2 additions & 2 deletions limix/qtl/_result/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ._st_factory import STScanResultFactory
from ._mt_factory import MTScanResultFactory
from ._ifactory import IScanResultFactory
from ._mt_factory import MTScanResultFactory
from ._st_factory import STScanResultFactory

__all__ = ["STScanResultFactory", "MTScanResultFactory", "IScanResultFactory"]
1 change: 1 addition & 0 deletions limix/qtl/_scan.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys

from limix._display import session_line

from .._data import asarray as _asarray, conform_dataset, normalize_likelihood
from .._display import session_block
from ._assert import assert_finite
Expand Down
5 changes: 3 additions & 2 deletions limix/qtl/test/test_qtl_iscan.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import scipy.stats as st
from limix.qc import normalise_covariance
from limix.qtl import iscan
from numpy import exp, eye, zeros
from numpy.random import RandomState

from limix.qc import normalise_covariance
from limix.qtl import iscan


def _test_qtl_iscan_three_hypotheses(lik):
random = RandomState(0)
Expand Down
7 changes: 4 additions & 3 deletions limix/qtl/test/test_qtl_scan.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import pytest
import scipy.stats as st
from limix.qc import normalise_covariance
from limix.qtl import scan
from limix.stats import linear_kinship
from numpy import (
argmin,
array,
Expand All @@ -20,6 +17,10 @@
from numpy.testing import assert_allclose
from pandas import DataFrame

from limix.qc import normalise_covariance
from limix.qtl import scan
from limix.stats import linear_kinship


def _test_qtl_scan_st(lik):
random = RandomState(0)
Expand Down

0 comments on commit 55fc1ba

Please sign in to comment.