From 311a48c64e8afc0fbcec31ec8040b04a8930d91c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 21 Jun 2022 11:53:51 +1200
Subject: [PATCH] Bump platformio to 6.0.2 (#3566)

---
 docker/Dockerfile         | 4 +---
 esphome/platformio_api.py | 4 ++--
 requirements.txt          | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dc8ba03f48..151c3231c8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,12 +46,10 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==5.2.5 \
+        platformio==6.0.2 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
-    && platformio settings set check_libraries_interval 1000000 \
     && platformio settings set check_platformio_interval 1000000 \
-    && platformio settings set check_platforms_interval 1000000 \
     && mkdir -p /piolibs
 
 
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 2072e25ec5..c4bf3d3f1a 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -20,7 +20,7 @@ def patch_structhash():
     # removed/added. This might have unintended consequences, but this improves compile
     # times greatly when adding/removing components and a simple clean build solves
     # all issues
-    from platformio.commands.run import helpers, command
+    from platformio.run import helpers, cli
     from os.path import join, isdir, getmtime
     from os import makedirs
 
@@ -39,7 +39,7 @@ def patch_structhash():
 
     # pylint: disable=protected-access
     helpers.clean_build_dir = patched_clean_build_dir
-    command.clean_build_dir = patched_clean_build_dir
+    cli.clean_build_dir = patched_clean_build_dir
 
 
 IGNORE_LIB_WARNINGS = f"(?:{'|'.join(['Hash', 'Update'])})"
diff --git a/requirements.txt b/requirements.txt
index dfe69cd33a..74efd9f717 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ tornado==6.1
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==5.2.5  # When updating platformio, also update Dockerfile
+platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20220508.0