From a064ab5c2b05573f1ca91c25f0f587cb5bb8a6dc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Jun 2023 16:36:54 +1200
Subject: [PATCH 1/2] Fix pypi release (#4983)

---
 .github/workflows/release.yml | 4 +++-
 script/setup                  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7ebd04e793..74ff4d87f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,9 +49,11 @@ jobs:
         with:
           python-version: "3.x"
       - name: Set up python environment
+        env:
+          ESPHOME_NO_VENV: 1
         run: |
           script/setup
-          pip install setuptools wheel twine
+          pip install twine
       - name: Build
         run: python setup.py sdist bdist_wheel
       - name: Upload
diff --git a/script/setup b/script/setup
index 656e95eba6..e1b5941d0e 100755
--- a/script/setup
+++ b/script/setup
@@ -5,12 +5,13 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-if [ ! -n "$DEVCONTAINER" ] && [ ! -n "$VIRTUAL_ENV" ]; then
+if [ ! -n "$DEVCONTAINER" ] && [ ! -n "$VIRTUAL_ENV" ] && [ ! "$ESPHOME_NO_VENV" ]; then
   python3 -m venv venv
   source venv/bin/activate
 fi
 
 pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+pip3 install setuptools wheel
 pip3 install --no-use-pep517 -e .
 
 pre-commit install

From 2047bba4f7a3e294efab85dffe77d97d22fc5c83 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Jun 2023 16:39:52 +1200
Subject: [PATCH 2/2] Bump version to 2023.6.0b5

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 6a3286abd7..32231d5c83 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.6.0b4"
+__version__ = "2023.6.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (