From ebd2e8775228107228cab5c4329ed2d283f91cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= <carlossmocholi@gmail.com>
Date: Thu, 29 Jul 2021 08:39:16 +0200
Subject: [PATCH] Delete deprecated `TrainerLoggingMixin` (#8609)

* Delete deprecated `TrainerLoggingMixin`
* Update CHANGELOG
* Delete from Trainer
---
 CHANGELOG.md                            |  4 +--
 pytorch_lightning/trainer/logging.py    | 34 -------------------------
 pytorch_lightning/trainer/trainer.py    |  2 --
 tests/deprecated_api/test_remove_1-5.py |  6 -----
 4 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 pytorch_lightning/trainer/logging.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33cdd1703..91013eb2a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,10 +58,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Removed deprecated `metrics` ([#8586](https://github.com/PyTorchLightning/pytorch-lightning/pull/8586/))
 
 
-- Removed the `outputs` argument in both the `LightningModule.on_train_epoch_end` and `Callback.on_train_epoch_end` hooks ([#8587](https://github.com/PyTorchLightning/pytorch-lightning/pull/8587))
+- Removed the deprecated `outputs` argument in both the `LightningModule.on_train_epoch_end` and `Callback.on_train_epoch_end` hooks ([#8587](https://github.com/PyTorchLightning/pytorch-lightning/pull/8587))
 
 
--
+- Delete the deprecated `TrainerLoggingMixin` class ([#8609](https://github.com/PyTorchLightning/pytorch-lightning/pull/8609))
 
 
 -
diff --git a/pytorch_lightning/trainer/logging.py b/pytorch_lightning/trainer/logging.py
deleted file mode 100644
index 74603782f3..0000000000
--- a/pytorch_lightning/trainer/logging.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The PyTorch Lightning team.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# 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.
-
-from abc import ABC
-
-from pytorch_lightning.utilities import rank_zero_deprecation
-from pytorch_lightning.utilities.metrics import metrics_to_scalars as new_metrics_to_scalars
-
-
-class TrainerLoggingMixin(ABC):
-    """
-    TODO: Remove this class in v1.5.
-
-    Use the utilities from ``pytorch_lightning.utilities.metrics`` instead.
-    """
-
-    def metrics_to_scalars(self, metrics: dict) -> dict:
-        rank_zero_deprecation(
-            "Internal: TrainerLoggingMixin.metrics_to_scalars is deprecated in v1.3"
-            " and will be removed in v1.5."
-            " Use `pytorch_lightning.utilities.metrics.metrics_to_scalars` instead."
-        )
-        return new_metrics_to_scalars(metrics)
diff --git a/pytorch_lightning/trainer/trainer.py b/pytorch_lightning/trainer/trainer.py
index 212086dc0f..6bb9263620 100644
--- a/pytorch_lightning/trainer/trainer.py
+++ b/pytorch_lightning/trainer/trainer.py
@@ -58,7 +58,6 @@ from pytorch_lightning.trainer.connectors.slurm_connector import SLURMConnector
 from pytorch_lightning.trainer.connectors.training_trick_connector import TrainingTricksConnector
 from pytorch_lightning.trainer.data_loading import TrainerDataLoadingMixin
 from pytorch_lightning.trainer.deprecated_api import DeprecatedTrainerAttributes
-from pytorch_lightning.trainer.logging import TrainerLoggingMixin
 from pytorch_lightning.trainer.model_hooks import TrainerModelHooksMixin
 from pytorch_lightning.trainer.optimizers import TrainerOptimizersMixin
 from pytorch_lightning.trainer.properties import TrainerProperties
@@ -97,7 +96,6 @@ class Trainer(
     TrainerCallbackHookMixin,
     TrainerModelHooksMixin,
     TrainerOptimizersMixin,
-    TrainerLoggingMixin,
     TrainerTrainingTricksMixin,
     TrainerDataLoadingMixin,
     DeprecatedTrainerAttributes,
diff --git a/tests/deprecated_api/test_remove_1-5.py b/tests/deprecated_api/test_remove_1-5.py
index 70b87d2b26..cce9176c97 100644
--- a/tests/deprecated_api/test_remove_1-5.py
+++ b/tests/deprecated_api/test_remove_1-5.py
@@ -247,12 +247,6 @@ def test_v1_5_0_lightning_module_write_prediction(tmpdir):
         trainer.test(model)
 
 
-def test_v1_5_0_trainer_logging_mixin(tmpdir):
-    trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, checkpoint_callback=False, logger=False)
-    with pytest.deprecated_call(match="is deprecated in v1.3 and will be removed in v1.5"):
-        trainer.metrics_to_scalars({})
-
-
 def test_v1_5_0_lighting_module_grad_norm(tmpdir):
     model = BoringModel()
     with pytest.deprecated_call(match="is deprecated in v1.3 and will be removed in v1.5"):