Skip to content

Commit

Permalink
Merge pull request #193 from jhlegarreta/FixImportFormatting
Browse files Browse the repository at this point in the history
STYLE: Fix import formatting
  • Loading branch information
jhlegarreta authored Oct 21, 2023
2 parents 3bd5f04 + 781a311 commit 4c93d41
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 42 deletions.
File renamed without changes.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ whitematteranalysis

[![test, package](https://github.com/SlicerDMRI/whitematteranalysis/actions/workflows/test_package.yaml/badge.svg?branch=master)](https://github.com/SlicerDMRI/whitematteranalysis/actions/workflows/test_package.yaml?query=branch%3Amaster)
[![Documentation Status](https://readthedocs.org/projects/whitematteranalysis/badge/?version=latest)](https://whitematteranalysis.readthedocs.io/en/latest/?badge=latest)
[![code format](https://github.com/SlicerDMRI/whitematteranalysis/actions/workflows/check_format.yml/badge.svg?branch=master)](https://github.com/SlicerDMRI/whitematteranalysis/actions/workflows/check_format.yml?query=branch%3Amaster)
[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)


Expand Down
17 changes: 5 additions & 12 deletions bin/wm_append_clusters_to_anatomical_tracts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,15 @@
import glob
import os

import pandas as pd
import vtk

import whitematteranalysis as wma
import pandas as pd

from whitematteranalysis.data.atlas.utils import (
ORGAtlasVersion,
get_local_atlas_bundle_fname,
)
from whitematteranalysis.anatomy.org_atlas_utils import (
ORGAtlasBundleFileHeading,
get_hemispheric_mono_bundles,
get_commissural_augmented_bundles,
add_org_atlas_prefix,
get_bundle_short_name,
)
ORGAtlasBundleFileHeading, add_org_atlas_prefix, get_bundle_short_name,
get_commissural_augmented_bundles, get_hemispheric_mono_bundles)
from whitematteranalysis.data.atlas.utils import (ORGAtlasVersion,
get_local_atlas_bundle_fname)


def get_hemispheric_mono_bundle_names(_df):
Expand Down
6 changes: 2 additions & 4 deletions utilities/wm_query_atlas_bundles_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
import argparse
from pathlib import Path

from whitematteranalysis.anatomy.org_atlas_utils import (
AtlasAvailability,
query_bundle_names,
)
from whitematteranalysis.anatomy.org_atlas_utils import (AtlasAvailability,
query_bundle_names)
from whitematteranalysis.fileio.utils import save2txt


Expand Down
7 changes: 2 additions & 5 deletions whitematteranalysis/anatomy/org_atlas_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@

import pandas as pd

from whitematteranalysis.fileio.utils import (
SlicerFileExtension,
VTKFileExtension,
find_filenames,
)
from whitematteranalysis.fileio.utils import (SlicerFileExtension,
VTKFileExtension, find_filenames)

atlas_bundle_file_prefix = "T_"
nonatlas_bundle_names = ["T_FalsePositive"]
Expand Down
24 changes: 7 additions & 17 deletions whitematteranalysis/anatomy/tests/test_org_atlas_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,13 @@
import pandas as pd

from whitematteranalysis.anatomy.org_atlas_utils import (
ORGAtlasBundleFileHeading,
get_association_bundles,
get_bundle_long_name,
get_bundle_short_name,
get_cerebellar_bundles,
get_commissural_bundles,
get_commissural_augmented_bundles,
get_hemispheric_bundles,
get_hemispheric_mono_bundles,
get_striatal_bundles,
get_projection_bundles,
get_superficial_bundles,
)
from whitematteranalysis.data.atlas.utils import (
ORGAtlasVersion,
get_local_atlas_bundle_fname,
)
ORGAtlasBundleFileHeading, get_association_bundles, get_bundle_long_name,
get_bundle_short_name, get_cerebellar_bundles,
get_commissural_augmented_bundles, get_commissural_bundles,
get_hemispheric_bundles, get_hemispheric_mono_bundles,
get_projection_bundles, get_striatal_bundles, get_superficial_bundles)
from whitematteranalysis.data.atlas.utils import (ORGAtlasVersion,
get_local_atlas_bundle_fname)


def _check_bundle_count(method_name, expected_bndl_count):
Expand Down
6 changes: 2 additions & 4 deletions whitematteranalysis/data/atlas/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@

import os

from whitematteranalysis.data.atlas.utils import (
ORGAtlasVersion,
get_local_atlas_bundle_fname,
)
from whitematteranalysis.data.atlas.utils import (ORGAtlasVersion,
get_local_atlas_bundle_fname)


def test_get_local_atlas_bundle_fname():
Expand Down

0 comments on commit 4c93d41

Please sign in to comment.