Apply isort, Black (had been erroneously disabled)

Author: mmore500

hstrat/genome_instrumentation/_HereditaryStratigraphicColumn.py

@@ -9,11 +9,11 @@
 from iterpop import iterpop as ip
 import opytional as opyt
 
-from ._HereditaryStratum import HereditaryStratum
-from .stratum_ordered_stores import HereditaryStratumOrderedStoreList
 from ..stratum_retention_strategy.stratum_retention_algorithms import (
     perfect_resolution_algo,
 )
+from ._HereditaryStratum import HereditaryStratum
+from .stratum_ordered_stores import HereditaryStratumOrderedStoreList
 
 
 class HereditaryStratigraphicColumn:

hstrat/genome_instrumentation/__init__.py

@@ -1,11 +1,11 @@
 """Data structures to annotate genomes with."""
 
+from . import stratum_ordered_stores
 from ._HereditaryStratigraphicColumn import HereditaryStratigraphicColumn
 from ._HereditaryStratigraphicColumnBundle import (
     HereditaryStratigraphicColumnBundle,
 )
 from ._HereditaryStratum import HereditaryStratum
-from . import stratum_ordered_stores
 from .stratum_ordered_stores import *  # noqa: F401
 
 # adapted from https://stackoverflow.com/a/31079085

hstrat/stratum_retention_strategy/__init__.py

@@ -1,11 +1,13 @@
 """Tools to specify stratum retention policy."""
 
+from . import (
+    stratum_retention_algorithms,
+    stratum_retention_policy_evaluators,
+    stratum_retention_policy_parameterizers,
+)
 from .stratum_retention_algorithms import *  # noqa: F401
 from .stratum_retention_policy_evaluators import *  # noqa: F401
 from .stratum_retention_policy_parameterizers import *  # noqa: F401
-from . import stratum_retention_algorithms
-from . import stratum_retention_policy_evaluators
-from . import stratum_retention_policy_parameterizers
 
 __all__ = (
     stratum_retention_algorithms.__all__

hstrat/stratum_retention_strategy/stratum_retention_algorithms/_detail/_PolicyCouplerFactory.py

@@ -5,9 +5,9 @@
 from .._impl import (
     CalcMrcaUncertaintyAbsUpperBoundAtPessimalRank,
     CalcMrcaUncertaintyAbsUpperBoundPessimalRankBruteForce,
+    CalcMrcaUncertaintyAbsUpperBoundWorstCase,
     CalcMrcaUncertaintyRelUpperBoundAtPessimalRank,
     CalcMrcaUncertaintyRelUpperBoundPessimalRankBruteForce,
-    CalcMrcaUncertaintyAbsUpperBoundWorstCase,
     CalcMrcaUncertaintyRelUpperBoundWorstCase,
     CalcNumStrataRetainedUpperBoundWorstCase,
 )

hstrat/stratum_retention_strategy/stratum_retention_algorithms/_detail/_UnsatisfiableParameterizationRequestError.py

@@ -4,4 +4,5 @@ class UnsatisfiableParameterizationRequestError(ValueError):
     May be due to inexistance of satisfactory parameter or due to violation of
     assumed monotonic relationship between parameter and focal property.
     """
+
     pass

hstrat/stratum_retention_strategy/stratum_retention_algorithms/_impl/_CalcMrcaUncertaintyRelUpperBoundWorstCase.py

@@ -1,9 +1,9 @@
 import typing
 
+from .._detail._PolicyCouplerBase import PolicyCouplerBase
 from ._CalcMrcaUncertaintyAbsUpperBoundWorstCase import (
     CalcMrcaUncertaintyAbsUpperBoundWorstCase,
 )
-from .._detail._PolicyCouplerBase import PolicyCouplerBase
 
 
 class CalcMrcaUncertaintyRelUpperBoundWorstCase:

hstrat/stratum_retention_strategy/stratum_retention_algorithms/_impl/__init__.py

@@ -4,6 +4,9 @@
 from ._CalcMrcaUncertaintyAbsUpperBoundPessimalRankBruteForce import (
     CalcMrcaUncertaintyAbsUpperBoundPessimalRankBruteForce,
 )
+from ._CalcMrcaUncertaintyAbsUpperBoundWorstCase import (
+    CalcMrcaUncertaintyAbsUpperBoundWorstCase,
+)
 from ._CalcMrcaUncertaintyRelExactFromAbs import (
     CalcMrcaUncertaintyRelExactFromAbs,
 )
@@ -13,9 +16,6 @@
 from ._CalcMrcaUncertaintyRelUpperBoundPessimalRankBruteForce import (
     CalcMrcaUncertaintyRelUpperBoundPessimalRankBruteForce,
 )
-from ._CalcMrcaUncertaintyAbsUpperBoundWorstCase import (
-    CalcMrcaUncertaintyAbsUpperBoundWorstCase,
-)
 from ._CalcMrcaUncertaintyRelUpperBoundWorstCase import (
     CalcMrcaUncertaintyRelUpperBoundWorstCase,
 )

hstrat/stratum_retention_strategy/stratum_retention_algorithms/recency_proportional_resolution_algo/_enact/_GenDropRanks_/_FromPredKeepRank.py

@@ -115,4 +115,5 @@ def __call__(
             stratum_rank,
         )
 
+
 FromPredKeepRank = GenDropRanksFromPredKeepRank(_PredKeepRank)

hstrat/stratum_retention_strategy/stratum_retention_policy_evaluators/__init__.py

@@ -1,20 +1,14 @@
 """Functors to specify property policies should be parameterized for."""
 
-from ._MrcaUncertaintyAbsExactEvaluator import (
-    MrcaUncertaintyAbsExactEvaluator,
-)
+from ._MrcaUncertaintyAbsExactEvaluator import MrcaUncertaintyAbsExactEvaluator
 from ._MrcaUncertaintyAbsUpperBoundEvaluator import (
     MrcaUncertaintyAbsUpperBoundEvaluator,
 )
-from ._MrcaUncertaintyRelExactEvaluator import (
-    MrcaUncertaintyRelExactEvaluator,
-)
+from ._MrcaUncertaintyRelExactEvaluator import MrcaUncertaintyRelExactEvaluator
 from ._MrcaUncertaintyRelUpperBoundEvaluator import (
     MrcaUncertaintyRelUpperBoundEvaluator,
 )
-from ._NumStrataRetainedExactEvaluator import (
-    NumStrataRetainedExactEvaluator,
-)
+from ._NumStrataRetainedExactEvaluator import NumStrataRetainedExactEvaluator
 from ._NumStrataRetainedUpperBoundEvaluator import (
     NumStrataRetainedUpperBoundEvaluator,
 )

hstrat/stratum_retention_viz/__init__.py

@@ -1,11 +1,7 @@
 """Visualizations for stratum retention policies."""
 
+from . import animate, plot
 from .animate import *  # noqa: F401
 from .plot import *  # noqa: F401
-from . import animate
-from . import plot
 
-__all__ = (
-    animate.__all__
-    + plot.__all__
-)
+__all__ = animate.__all__ + plot.__all__