From b45cdc9cb6ba82f1c109a075c995befebea0127f Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 26 Sep 2024 13:13:31 +0300
Subject: [PATCH 1/2] Declare pip dependencies statically // Resolve #4955

---
 platformio/dependencies.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/platformio/dependencies.py b/platformio/dependencies.py
index 7f8fc7cf05..331c1bdbf8 100644
--- a/platformio/dependencies.py
+++ b/platformio/dependencies.py
@@ -14,7 +14,7 @@
 
 import platform
 
-from platformio.compat import PY36, is_proxy_set
+from platformio.compat import is_proxy_set
 
 
 def get_core_dependencies():
@@ -30,7 +30,8 @@ def get_core_dependencies():
 
 def get_pip_dependencies():
     core = [
-        "bottle == %s" % ("0.12.*" if PY36 else "0.13.*"),
+        'bottle == 0.12.*; python_version < "3.7"',
+        'bottle == 0.13.*; python_version >= "3.7"',
         "click >=8.0.4, <9",
         "colorama",
         "marshmallow == 3.*",
@@ -45,7 +46,8 @@ def get_pip_dependencies():
         # PIO Home requirements
         "ajsonrpc == 1.2.*",
         "starlette >=0.19, <0.40",
-        "uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.31"),
+        'uvicorn == 0.16.0; python_version < "3.7"',
+        'uvicorn >=0.16, <0.31; python_version >= "3.7"',
         "wsproto == 1.*",
     ]
 
@@ -53,7 +55,9 @@ def get_pip_dependencies():
 
     # issue #4702; Broken "requests/charset_normalizer" on macOS ARM
     if platform.system() == "Darwin" and "arm" in platform.machine().lower():
-        extra.append("chardet>=3.0.2,<6")
+        extra.append(
+            'chardet >= 3.0.2,<6; platform_system == "Darwin" and "arm" in platform_machine'
+        )
 
     # issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+
     try:

From 03e84fe325a383b78438431c71df3c4aa8f6a745 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 26 Sep 2024 13:13:50 +0300
Subject: [PATCH 2/2] Bump version to 6.1.16

---
 HISTORY.rst            | 2 +-
 docs                   | 2 +-
 platformio/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index b4b5fc529f..dcfc498a1b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -18,7 +18,7 @@ Unlock the true potential of embedded software development with
 PlatformIO's collaborative ecosystem, embracing declarative principles,
 test-driven methodologies, and modern toolchains for unrivaled success.
 
-6.1.16 (2024-??-??)
+6.1.16 (2024-09-26)
 ~~~~~~~~~~~~~~~~~~~
 
 * Added support for Python 3.13
diff --git a/docs b/docs
index 54af3660ee..dd3d549bdb 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 54af3660ee1fc8115844c3e7db4604496cd13db0
+Subproject commit dd3d549bdbfac9a30eadeb32e37cbd6f6c6591f7
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 958fdd4ed4..ff315cafb5 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "16rc1")
+VERSION = (6, 1, 16)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"