Merge branch 'main' into change-naming

.pre-commit-config.yaml

@@ -1,16 +1,13 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
-- repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.272
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.6.0
   hooks:
-    - id: ruff
-- repo: https://github.com/psf/black
-  rev: 23.3.0
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-yaml
+  - id: check-added-large-files
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.6.8
   hooks:
-  - id: black
+    - id: ruff
+    - id: ruff-format

LICENSE

@@ -200,4 +200,4 @@ Copyright 2020 The ASReview Authors.  All rights reserved.
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

asreviewcontrib/insights/plot.py

@@ -423,16 +423,23 @@ def _add_optimal_curve(ax, labels, x_absolute, y_absolute):
         n_docs = len(labels)
 
     # Create x and y arrays for step plot
-    x = np.arange(0, n_pos_docs + 1) if x_absolute else np.arange(0, n_pos_docs + 1) / n_docs  # noqa: E501
-    y = np.arange(0, n_pos_docs + 1) if y_absolute else np.arange(0, n_pos_docs + 1) / n_pos_docs  # noqa: E501
+    x = (
+        np.arange(0, n_pos_docs + 1)
+        if x_absolute
+        else np.arange(0, n_pos_docs + 1) / n_docs
+    )
+    y = (
+        np.arange(0, n_pos_docs + 1)
+        if y_absolute
+        else np.arange(0, n_pos_docs + 1) / n_pos_docs
+    )
 
     # Plot the stepwise optimal curve
     ax.step(x, y, color="grey", where="post")
 
     return ax
 
 
-
 def _add_wss_curve(ax, labels, x_absolute=False, y_absolute=False, legend_label=None):
     x, y = _wss_values(labels, x_absolute=x_absolute, y_absolute=y_absolute)
     ax.step(x, y, where="post", label=legend_label)

docs/stats_explainer.py

@@ -6,7 +6,6 @@
 python docs/stats_explainer.py
 """
 
-
 import matplotlib.pyplot as plt
 import numpy as np
 

pyproject.toml

@@ -41,8 +41,8 @@ packages = ["asreviewcontrib"]
 [tool.setuptools_scm]
 write_to = "asreviewcontrib/insights/_version.py"
 
-[tool.ruff]
+[tool.ruff.lint]
 select = ["E", "F", "UP", "I", "B"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 force-single-line = true

tests/README.md

@@ -5,4 +5,4 @@
 ```
 asreview simulate benchmark:van_de_schoot_2017 -s sim_van_de_schoot_2017_stop_if_min.asreview --init_seed 535 --seed 400 --stop_if min
 asreview simulate benchmark:van_de_schoot_2017 -s sim_van_de_schoot_2017_stop_if_full.asreview --init_seed 535 --seed 400 --stop_if -1
-```
+```