Merge pull request #396 from Crunch-io/isort-cube

ruff on codebase

.pre-commit-config.yaml

@@ -1,19 +1,16 @@
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.4.0-1
-    hooks:
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-
-  - repo: https://github.com/ambv/black
-    rev: 24.1.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.1
     hooks:
-      - id: black
+      - id: ruff-format
+      - id: ruff
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
     hooks:
-      - id: flake8
+      - id: trailing-whitespace
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
 
   - repo: https://github.com/milin/giticket
     rev: v1.2

setup.cfg

@@ -8,7 +8,9 @@ testpaths =
 [flake8]
 show-source = True
 max-line-length = 88
-ignore = W503  # line break after binary operator (e.g. 'and')
+ignore =
+    # line break after binary operator (e.g. 'and')
+    W503
 
 [isort]
 combine_as_imports=1

src/cr/cube/collator.py

@@ -17,8 +17,8 @@
 import numpy as np
 
 from cr.cube.dimension import Dimension, Element, _OrderSpec, _Subtotals
-from cr.cube.util import lazyproperty
 from cr.cube.enums import ORDER_FORMAT
+from cr.cube.util import lazyproperty
 
 
 class _BaseCollator:

src/cr/cube/cubepart.py

@@ -16,21 +16,22 @@
 """
 
 import math
+
 import numpy as np
 from tabulate import tabulate
 
 from cr.cube.collator import PayloadOrderCollator
 from cr.cube.enums import (
     CUBE_MEASURE as CM,
     DIMENSION_TYPE as DT,
-    ORDER_FORMAT,
     MARGINAL_ORIENTATION as MO,
+    ORDER_FORMAT,
 )
 from cr.cube.matrix.assembler import _BaseOrderHelper
 from cr.cube.matrix.measure import SecondOrderMeasures
 from cr.cube.matrix.subtotals import SumSubtotals
-from cr.cube.min_base_size_mask import MinBaseSizeMask
 from cr.cube.measures.pairwise_significance import PairwiseSignificance
+from cr.cube.min_base_size_mask import MinBaseSizeMask
 from cr.cube.scalar import MeansScalar
 from cr.cube.stripe.assembler import _BaseOrderHelper as stripe_BaseOrderHelper
 from cr.cube.stripe.measure import StripeMeasures

src/cr/cube/matrix/measure.py

@@ -10,9 +10,9 @@
 from cr.cube.matrix.subtotals import (
     NanSubtotals,
     NegativeTermSubtotals,
+    OverlapSubtotals,
     PositiveTermSubtotals,
     SumSubtotals,
-    OverlapSubtotals,
 )
 from cr.cube.smoothing import Smoother
 from cr.cube.util import lazyproperty
@@ -711,7 +711,7 @@ def is_defined(self):
 
         We cannot sum counts across subvariable dimensions.
         """
-        return not self._dimensions[1].dimension_type in DT.ARRAY_TYPES
+        return self._dimensions[1].dimension_type not in DT.ARRAY_TYPES
 
 
 class _ColumnIndex(_BaseSecondOrderMeasure):
@@ -1819,7 +1819,7 @@ def is_defined(self):
 
         We cannot sum counts across subvariable dimensions.
         """
-        return not self._dimensions[0].dimension_type in DT.ARRAY_TYPES
+        return self._dimensions[0].dimension_type not in DT.ARRAY_TYPES
 
 
 class _RowProportions(_BaseSecondOrderMeasure):

src/cr/cube/stripe/assembler.py

@@ -18,7 +18,6 @@
 from cr.cube.enums import COLLATION_METHOD as CM, ORDER_FORMAT
 from cr.cube.util import lazyproperty
 
-
 # === ORDER HELPERS ===
 
 

src/cr/cube/stripe/measure.py

@@ -15,7 +15,6 @@
 )
 from cr.cube.util import lazyproperty
 
-
 # === MEASURE COLLECTION ===
 
 

src/cr/cube/util.py

@@ -2,8 +2,8 @@
 
 """Utility functions for crunch cube, as well as other modules."""
 
-from datetime import datetime
 import functools
+from datetime import datetime
 
 
 def format(x) -> str: