fmt

nblast-py/Makefile

@@ -52,12 +52,12 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr .pytest_cache
 
 fmt:
-	black $(PY_PATHS)
+	ruff format $(PY_PATHS)
 	cargo fmt
 
 lint: ## check style with flake8
-	flake8 $(PY_PATHS)
-	black --check $(PY_PATHS)
+	ruff check $(PY_PATHS)
+	ruff format --check $(PY_PATHS)
 
 test: ## run tests quickly with the default Python
 	maturin develop

nblast-py/python/pynblast/arena.py

@@ -101,9 +101,7 @@ def add_points_tangents_alphas(
             if alphas.shape != (len(points),):
                 raise ValueError("Alphas must be 1D and have same length as points")
 
-        return self._impl.add_points_tangents_alphas(
-            points, tangents, alphas
-        )
+        return self._impl.add_points_tangents_alphas(points, tangents, alphas)
 
     def query_target(
         self,

nblast-py/requirements.txt

@@ -19,5 +19,4 @@ watchdog==2.3.1
 ruff
 coverage==7.2.1
 Sphinx==6.1.3
-black==23.1
 mypy==1.1.1

nblast-rs/src/lib.rs

@@ -174,8 +174,6 @@ impl Symmetry {
     }
 }
 
-
-
 /// The result of comparing two (point, tangent) tuples.
 /// Contains the Euclidean distance between the points,
 /// and the absolute dot product of the (unit) tangents,

nblast-rs/src/neurons/nabo.rs

@@ -105,10 +105,7 @@ impl NaboTangentsAlphas {
         let (tree, tangents_alphas) = points_to_nabo_tangents_alphas(points.iter(), k);
         Self {
             tree,
-            points_tangents_alphas: points
-                .into_iter()
-                .zip(tangents_alphas)
-                .collect(),
+            points_tangents_alphas: points.into_iter().zip(tangents_alphas).collect(),
         }
     }
 
@@ -120,10 +117,7 @@ impl NaboTangentsAlphas {
         let tree = points_to_nabo(points.iter());
         Self {
             tree,
-            points_tangents_alphas: points
-                .into_iter()
-                .zip(tangents_alphas)
-                .collect(),
+            points_tangents_alphas: points.into_iter().zip(tangents_alphas).collect(),
         }
     }
 }