isort

Author: Borda

pytorch_lightning/metrics/classification/precision_recall.py

@@ -13,8 +13,6 @@
 # limitations under the License.
 from typing import Any, Callable, Optional
 
-import torch
-
 from torchmetrics import Precision as _Precision
 from torchmetrics import Recall as _Recall
 

pytorch_lightning/metrics/functional/precision_recall.py

@@ -15,8 +15,8 @@
 
 import torch
 from torchmetrics.functional import precision as _precision
-from torchmetrics.functional import recall as _recall
 from torchmetrics.functional import precision_recall as _precision_recall
+from torchmetrics.functional import recall as _recall
 
 from pytorch_lightning.utilities.deprecation import deprecated
 

pytorch_lightning/metrics/functional/precision_recall_curve.py

@@ -19,7 +19,6 @@
 from pytorch_lightning.utilities.deprecation import deprecated
 
 
-
 @deprecated(target=_precision_recall_curve, ver_deprecate="1.3.0", ver_remove="1.5.0")
 def precision_recall_curve(
     preds: torch.Tensor,
@@ -28,7 +27,7 @@ def precision_recall_curve(
     pos_label: Optional[int] = None,
     sample_weights: Optional[Sequence] = None,
 ) -> Union[Tuple[torch.Tensor, torch.Tensor, torch.Tensor], Tuple[List[torch.Tensor], List[torch.Tensor],
-                                                                  List[torch.Tensor]],]:
+                                                                  List[torch.Tensor]], ]:
     """
     .. deprecated::
         Use :func:`torchmetrics.functional.accuracy`. Will be removed in v1.5.0.

pytorch_lightning/utilities/deprecation.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 import inspect
 from functools import wraps
-from typing import Any, Callable, List, Tuple, Optional
+from typing import Any, Callable, List, Optional, Tuple
 
 from pytorch_lightning.utilities import rank_zero_warn
 

tests/metrics/test_remove_1-5_metrics.py

@@ -16,10 +16,21 @@
 import pytest
 import torch
 
-from pytorch_lightning.metrics import (Accuracy, MetricCollection, AveragePrecision, Precision, Recall,
-    PrecisionRecallCurve)
-from pytorch_lightning.metrics.functional import (average_precision, precision, recall, precision_recall,
-    precision_recall_curve)
+from pytorch_lightning.metrics import (
+    Accuracy,
+    AveragePrecision,
+    MetricCollection,
+    Precision,
+    PrecisionRecallCurve,
+    Recall,
+)
+from pytorch_lightning.metrics.functional import (
+    average_precision,
+    precision,
+    precision_recall,
+    precision_recall_curve,
+    recall,
+)
 from pytorch_lightning.metrics.functional.accuracy import accuracy
 from pytorch_lightning.metrics.utils import get_num_classes, select_topk, to_categorical, to_onehot
 
@@ -58,7 +69,7 @@ def test_v1_5_metrics_collection():
     MetricCollection.__init__.warned = False
     with pytest.deprecated_call(
         match="`pytorch_lightning.metrics.metric.MetricCollection` was deprecated since v1.3.0 in favor"
-              " of `torchmetrics.collections.MetricCollection`. It will be removed in v1.5.0."
+        " of `torchmetrics.collections.MetricCollection`. It will be removed in v1.5.0."
     ):
         metrics = MetricCollection([Accuracy()])
     assert metrics(preds, target) == {'Accuracy': torch.tensor(0.1250)}

tests/utilities/test_deprecation.py

@@ -30,7 +30,7 @@ def dep3_sum(a, b=4):
 def test_deprecated_func():
     with pytest.deprecated_call(
         match='`tests.utilities.test_deprecation.dep_sum` was deprecated since v0.1 in favor'
-              ' of `tests.utilities.test_deprecation.my_sum`. It will be removed in v0.5.'
+        ' of `tests.utilities.test_deprecation.my_sum`. It will be removed in v0.5.'
     ):
         assert dep_sum(2) == 7
 
@@ -41,7 +41,7 @@ def test_deprecated_func():
     # and does not affect other functions
     with pytest.deprecated_call(
         match='`tests.utilities.test_deprecation.dep3_sum` was deprecated since v0.1 in favor'
-              ' of `tests.utilities.test_deprecation.my2_sum`. It will be removed in v0.5.'
+        ' of `tests.utilities.test_deprecation.my2_sum`. It will be removed in v0.5.'
     ):
         assert dep3_sum(2, 1) == 3
 
@@ -61,7 +61,7 @@ def test_deprecated_func_incomplete():
     # does not affect other functions
     with pytest.deprecated_call(
         match='`tests.utilities.test_deprecation.dep2_sum` was deprecated since v0.1 in favor'
-              ' of `tests.utilities.test_deprecation.my2_sum`. It will be removed in v0.5.'
+        ' of `tests.utilities.test_deprecation.my2_sum`. It will be removed in v0.5.'
     ):
         assert dep2_sum(b=2, a=1) == 3
 
@@ -83,7 +83,7 @@ def __init__(self, c, d="efg"):
 def test_deprecated_class():
     with pytest.deprecated_call(
         match='`tests.utilities.test_deprecation.PastCls` was deprecated since v0.2 in favor'
-              ' of `tests.utilities.test_deprecation.NewCls`. It will be removed in v0.4.'
+        ' of `tests.utilities.test_deprecation.NewCls`. It will be removed in v0.4.'
     ):
         past = PastCls(2)
     assert past.my_c == 2