From 9f46568a86a54412906b1e6de9f6c0e7afb21b68 Mon Sep 17 00:00:00 2001
From: Green <77177015+GreenDiscord@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:10:05 +0100
Subject: [PATCH 1/2] docs(flashing): Fixed a typo in
 /docs/en/esptool/flashing-firmware.rst

Updated the text in this file to fix a typo which was decives, that is now devices.
---
 docs/en/esptool/flashing-firmware.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/esptool/flashing-firmware.rst b/docs/en/esptool/flashing-firmware.rst
index 6c4276b05..78a6c575d 100644
--- a/docs/en/esptool/flashing-firmware.rst
+++ b/docs/en/esptool/flashing-firmware.rst
@@ -8,7 +8,7 @@ Flashing Firmware
 Esptool is used under the hood of many development frameworks for Espressif SoCs, such as `ESP-IDF <https://docs.espressif.com/projects/esp-idf/>`_, `Arduino <https://docs.espressif.com/projects/arduino-esp32/>`_, or `PlatformIO <https://docs.platformio.org/en/latest/platforms/espressif32.html>`_.
 After the resulting firmware binary files are compiled, esptool is used to flash these into the device.
 
-Sometimes there might be a need to comfortably flash a bigger amount of decives with the same binaries or to share flashing instructions with a third party.
+Sometimes there might be a need to comfortably flash a bigger amount of devices with the same binaries or to share flashing instructions with a third party.
 It is possible to compile the firmware just once and then repeatedly use esptool (manually or :ref:`in a custom script <scripting>`) to flash the files.
 
 Sharing these instructions and below mentioned assets with a third party (for example a manufacturer) should suffice to allow reproducible and quick flashing of your application into an Espressif chip.

From 88f6186ae05ab0daede6d727684461fa20435c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radim=20Karni=C5=A1?= <radim.karnis@espressif.com>
Date: Mon, 29 Apr 2024 12:44:18 +0200
Subject: [PATCH 2/2] ci(hsm_tests): Run tests in a virtual env

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dcc5f068..c8d89690c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,8 +144,10 @@ host_tests_hsm:
     PYTEST_ADDOPTS: "-sv --junitxml=test/report.xml --color=yes"
   before_script:
     - apt-get update
-    - apt-get install -y python3 python3-pip softhsm2
+    - apt-get install -y python3 python3-pip python3-venv softhsm2
     - ./ci/setup_softhsm2.sh || exit 1
+    - python3 -m venv esptoolenv
+    - source esptoolenv/bin/activate
     - pip3 install -e .[dev,hsm] --prefer-binary
   script:
     - coverage run --parallel-mode -m pytest ${CI_PROJECT_DIR}/test/test_espsecure_hsm.py