From 831f7f52bc4b11c1b878d6ddddbd6154b9e27349 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 29 Jul 2023 16:01:57 +0300
Subject: [PATCH] Automatically update PIO Core PyPi dependencies on "upgrade"
 operation

---
 platformio/__init__.py         | 19 ++++++++++++++
 platformio/commands/upgrade.py | 36 +++++++++++++++++++++----
 setup.py                       | 48 +++-------------------------------
 3 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/platformio/__init__.py b/platformio/__init__.py
index aa43c2d1..8ca26c74 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -56,3 +56,22 @@ __check_internet_hosts__ = [
     "88.198.170.159",  # platformio.org
     "github.com",
 ] + __registry_mirror_hosts__
+
+__install_requires__ = [
+    # Core requirements
+    "bottle == 0.12.*",
+    "click >=8.0.4, <=8.2",
+    "colorama",
+    "marshmallow == 3.*",
+    "pyelftools == 0.29",
+    "pyserial == 3.5.*",  # keep in sync "device/monitor/terminal.py"
+    "requests == 2.*",
+    "semantic_version == 2.10.*",
+    "tabulate == 0.*",
+] + [
+    # PIO Home requirements
+    "ajsonrpc == 1.2.*",
+    "starlette >=0.19, <0.32",
+    "uvicorn >=0.16, <0.24",
+    "wsproto == 1.*",
+]
diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py
index 9e4d61d2..3fb611ea 100644
--- a/platformio/commands/upgrade.py
+++ b/platformio/commands/upgrade.py
@@ -18,7 +18,7 @@ import subprocess
 
 import click
 
-from platformio import VERSION, __version__, app, exception
+from platformio import VERSION, __install_requires__, __version__, app, exception
 from platformio.http import fetch_remote_content
 from platformio.package.manager.core import update_core_packages
 from platformio.proc import get_pythonexe_path
@@ -33,9 +33,14 @@ DEVELOP_INIT_SCRIPT_URL = (
 
 @click.command("upgrade", short_help="Upgrade PlatformIO Core to the latest version")
 @click.option("--dev", is_flag=True, help="Use development branch")
+@click.option("--only-dependencies", is_flag=True)
 @click.option("--verbose", "-v", is_flag=True)
-def cli(dev, verbose):
+def cli(dev, only_dependencies, verbose):
+    if only_dependencies:
+        return upgrade_pypi_dependencies(verbose)
+
     update_core_packages()
+
     if not dev and __version__ == get_latest_version():
         return click.secho(
             "You're up-to-date!\nPlatformIO %s is currently the "
@@ -50,11 +55,21 @@ def cli(dev, verbose):
     pkg_spec = DEVELOP_ZIP_URL if to_develop else "platformio"
 
     try:
+        # PIO Core
         subprocess.run(
             [python_exe, "-m", "pip", "install", "--upgrade", pkg_spec],
             check=True,
             stdout=subprocess.PIPE if not verbose else None,
         )
+
+        # PyPI dependencies
+        subprocess.run(
+            [python_exe, "-m", "platformio", "upgrade", "--only-dependencies"],
+            check=False,
+            stdout=subprocess.PIPE,
+        )
+
+        # Check version
         output = subprocess.run(
             [python_exe, "-m", "platformio", "--version"],
             check=True,
@@ -87,9 +102,20 @@ def cli(dev, verbose):
     return True
 
 
-def get_pkg_spec(to_develop):
-    if to_develop:
-        return
+def upgrade_pypi_dependencies(verbose):
+    subprocess.run(
+        [
+            get_pythonexe_path(),
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            "pip",
+            *__install_requires__,
+        ],
+        check=True,
+        stdout=subprocess.PIPE if not verbose else None,
+    )
 
 
 def get_latest_version():
diff --git a/setup.py b/setup.py
index ef9543e3..5872ccf5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import platform
 from setuptools import find_packages, setup
 
 from platformio import (
@@ -22,52 +23,9 @@ from platformio import (
     __title__,
     __url__,
     __version__,
+    __install_requires__,
 )
 
-py_37 = "python_version == '3.7'"
-py_below_37 = "python_version < '3.7'"
-py_gte_37 = "python_version >= '3.7'"
-py_gte_38 = "python_version >= '3.8'"
-
-minimal_requirements = [
-    "bottle==0.12.*",
-    "click==8.0.4; " + py_below_37,
-    "click==8.1.*; " + py_gte_37,
-    "colorama",
-    "marshmallow==3.14.1; " + py_below_37,
-    "marshmallow==3.19.0; " + py_37,
-    "marshmallow==3.20.*; " + py_gte_38,
-    "pyelftools==0.29",
-    "pyserial==3.5.*",  # keep in sync "device/monitor/terminal.py"
-    "requests==2.*",
-    "semantic_version==2.10.*",
-    "tabulate==0.*",
-]
-
-home_requirements = [
-    "ajsonrpc==1.2.*",
-    "starlette==0.19.1; " + py_below_37,
-    "starlette==0.29.0; " + py_37,
-    "starlette==0.31.*; " + py_gte_38,
-    "uvicorn==0.16.0; " + py_below_37,
-    "uvicorn==0.22.0; " + py_37,
-    "uvicorn==0.23.*; " + py_gte_38,
-    "wsproto==1.0.0; " + py_below_37,
-    "wsproto==1.2.*; " + py_gte_37,
-]
-
-# issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+
-try:
-    import ssl
-
-    if ssl.OPENSSL_VERSION.startswith("OpenSSL ") and ssl.OPENSSL_VERSION_INFO < (
-        1,
-        1,
-        1,
-    ):
-        minimal_requirements.append("urllib3<2")
-except ImportError:
-    pass
 
 
 setup(
@@ -79,7 +37,7 @@ setup(
     author_email=__email__,
     url=__url__,
     license=__license__,
-    install_requires=minimal_requirements + home_requirements,
+    install_requires=__install_requires__,
     python_requires=">=3.6",
     packages=find_packages(include=["platformio", "platformio.*"]),
     package_data={