Merge branch 'main' of https://github.com/AstraZeneca/rexmex into main

Author: kajocina

pyproject.toml

@@ -1,3 +1,7 @@
+[tool.black]
+line-length = 120
+target-version = ["py37", "py38", "py39"]
+
 [tool.isort]
 profile = "black"
 multi_line_output = 3

rexmex/__init__.py

@@ -1,4 +1,2 @@
-from rexmex import dataset, metricset, scorecard, utils
-from rexmex.metrics import classification, coverage, ranking, rating
-
-all = ["scorecard", "dataset", "rexmex.metrics.*", "metricset", "utils"]
+from rexmex import dataset, metricset, scorecard, utils  # noqa:F401
+from rexmex.metrics import classification, coverage, ranking, rating  # noqa:F401

rexmex/metrics/__init__.py

@@ -1,4 +1,4 @@
-from .classification import *
-from .coverage import *
-from .ranking import *
-from .rating import *
+from .classification import *  # noqa:F401,F403
+from .coverage import *  # noqa:F401,F403
+from .ranking import *  # noqa:F401,F403
+from .rating import *  # noqa:F401,F403

tests/integration/test_aggregation.py

@@ -1,7 +1,5 @@
 import unittest
 
-import pytest
-
 from rexmex.dataset import DatasetReader
 from rexmex.metricset import ClassificationMetricSet, RatingMetricSet
 from rexmex.scorecard import ScoreCard
@@ -19,14 +17,10 @@ def test_classification(self):
         performance_metrics = score_card.generate_report(self.scores)
         assert performance_metrics.shape == (1, 11)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group"])
         assert performance_metrics.shape == (5, 11)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group", "target_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group", "target_group"])
         assert performance_metrics.shape == (20, 11)
 
     def test_regression(self):
@@ -37,14 +31,10 @@ def test_regression(self):
         performance_metrics = score_card.generate_report(self.scores)
         assert performance_metrics.shape == (1, 7)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group"])
         assert performance_metrics.shape == (5, 7)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group", "target_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group", "target_group"])
         assert performance_metrics.shape == (20, 7)
 
     def test_addition(self):
@@ -54,12 +44,8 @@ def test_addition(self):
         performance_metrics = score_card.generate_report(self.scores)
         assert performance_metrics.shape == (1, 18)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group"])
         assert performance_metrics.shape == (5, 18)
 
-        performance_metrics = score_card.generate_report(
-            self.scores, grouping=["source_group", "target_group"]
-        )
+        performance_metrics = score_card.generate_report(self.scores, grouping=["source_group", "target_group"])
         assert performance_metrics.shape == (20, 18)

tests/unit/test_dataset.py

@@ -1,7 +1,5 @@
 import unittest
 
-import pytest
-
 from rexmex.dataset import DatasetReader
 
 
@@ -13,16 +11,11 @@ def test_erdos_renyi_structure(self):
 
         assert dataset.shape[0] == 50378
         assert dataset.shape[1] == 6
-        assert (
-            set(
-                [
-                    "source_group",
-                    "target_group",
-                    "source_id",
-                    "target_id",
-                    "y_score",
-                    "y_true",
-                ]
-            ).issubset(dataset.columns)
-            == True
-        )
+        assert {
+            "source_group",
+            "target_group",
+            "source_id",
+            "target_id",
+            "y_score",
+            "y_true",
+        }.issubset(dataset.columns)

tests/unit/test_metrics.py

@@ -1,7 +1,6 @@
 import unittest
 
 import numpy as np
-import pytest
 
 from rexmex.metrics.classification import (
     condition_negative,

tests/unit/test_metricset.py

@@ -2,8 +2,6 @@
 import unittest
 from io import StringIO
 
-import pandas as pd
-import pytest
 from sklearn.metrics import accuracy_score, balanced_accuracy_score
 
 from rexmex.metricset import (

tests/unit/test_scorecard.py

@@ -2,8 +2,6 @@
 import unittest
 from io import StringIO
 
-import pytest
-
 from rexmex.metricset import ClassificationMetricSet
 from rexmex.scorecard import ScoreCard
 

tox.ini

@@ -25,7 +25,7 @@ deps =
     flake8-black
     flake8-isort
 commands =
-    flake8 --select BLK120,I001 rexmex/ tests/ setup.py
+    flake8 --max-line-length 120 rexmex/ tests/ setup.py
 
 [testenv:mypy]
 deps = mypy