Merge branch 'release/1.3.x' into v1.3.4

Author: tchaton

CHANGELOG.md

@@ -172,22 +172,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [1.3.4] - 2021-06-01
 
-### Changed
-
 ### Fixed
 
 - Update pre-commit and add new hooks ([#7781](https://github.com/PyTorchLightning/pytorch-lightning/pull/7781))
 - fix info message when max training time reached ([#7780](https://github.com/PyTorchLightning/pytorch-lightning/pull/7780))
 - Fixed missing __len__ method to IndexBatchSamplerWrapper ([#7681](https://github.com/PyTorchLightning/pytorch-lightning/pull/7681))
 
-
-
-
 ## [1.3.3] - 2021-05-27
 
 ### Changed
 
-
 - Move parameter validation specific to TPU Training plugins ([#7415](https://github.com/PyTorchLightning/pytorch-lightning/pull/7415))
 
 ### Fixed
@@ -216,6 +210,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [1.3.1] - 2021-05-11
 
+
 ### Fixed
 
 - Fixed DeepSpeed with IterableDatasets ([#7362](https://github.com/PyTorchLightning/pytorch-lightning/pull/7362))

pytorch_lightning/utilities/types.py

@@ -1,12 +1,14 @@
-from typing import Any, Dict, Iterator, List, Union
-
-import torch
-from torchmetrics import Metric
 """
 Convention:
  - Do not include any `_TYPE` suffix
  - Types used in public hooks (as those in the `LightningModule` and `Callback`) should be public (no trailing `_`)
 """
+
+from typing import Any, Dict, Iterator, List, Union
+
+import torch
+from torchmetrics import Metric
+
 _METRIC = Union[Metric, torch.Tensor, int, float]
 STEP_OUTPUT = Union[torch.Tensor, Dict[str, Any]]
 EPOCH_OUTPUT = List[STEP_OUTPUT]