Merge branch 'release/v1.1.3'

Author: ivankravets

.github/workflows/main.yml

@@ -8,17 +8,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        exclude:
-          - os: macos-latest
-            python-version: "3.6"
-          - os: windows-latest
-            python-version: "3.6"            
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Check Python
@@ -37,11 +32,15 @@ jobs:
       - name: Integration Tests
         run: |
           make test
-#      - name: Slack Notification
-#        uses: homoluctus/slatify@master
-#        if: failure()
-#        with:
-#          type: ${{ job.status }}
-#          job_name: '*Installer*'
-#          commit: true
-#          url: ${{ secrets.SLACK_BUILD_WEBHOOK }}
+      - name: Pack Installer Script
+        run: |
+          make pack
+      - name: Install PlatformIO Core
+        run: |
+          python3 get-platformio.py
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            ~/.platformio/penv/Scripts/pio.exe system info
+          else
+            ~/.platformio/penv/bin/pio system info
+          fi
+        shell: bash

get-platformio.py

@@ -14,7 +14,7 @@
 
 import logging.config
 
-VERSION = (1, 1, 2)
+VERSION = (1, 1, 3)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio-installer"

pioinstaller/__init__.py

@@ -90,7 +90,7 @@ def python():
             % (platform.python_version(), util.get_pythonexe_path()),
             fg="green",
         )
-    except (exception.IncompatiblePythonError, exception.DistutilsNotFound) as e:
+    except (exception.IncompatiblePythonError, exception.PythonVenvModuleNotFound) as e:
         raise click.ClickException(
             "The Python %s (%s) interpreter is not compatible.\nReason: %s"
             % (platform.python_version(), util.get_pythonexe_path(), str(e))
@@ -123,7 +123,7 @@ def core_check(ctx, **kwargs):
             % (state.get("core_version"), state.get("platformio_exe")),
             fg="green",
         )
-    except (exception.InvalidPlatformIOCore) as e:
+    except exception.InvalidPlatformIOCore as e:
         raise click.ClickException(
             "Compatible PlatformIO Core not found.\nReason: %s" % str(e)
         )

pioinstaller/__main__.py

@@ -14,7 +14,6 @@
 
 
 class PIOInstallerException(Exception):
-
     MESSAGE = None
 
     def __str__(self):  # pragma: no cover
@@ -26,15 +25,12 @@ def __str__(self):  # pragma: no cover
 
 
 class IncompatiblePythonError(PIOInstallerException):
-
     MESSAGE = "{0}"
 
 
-class DistutilsNotFound(PIOInstallerException):
-
-    MESSAGE = "Could not find distutils module"
+class PythonVenvModuleNotFound(PIOInstallerException):
+    MESSAGE = "Could not find Python `venv` module"
 
 
 class InvalidPlatformIOCore(PIOInstallerException):
-
     MESSAGE = "{0}"

pioinstaller/exception.py

@@ -96,7 +96,8 @@ def get_portable_python_url():
     systype = util.get_systype()
     result = requests.get(
         "https://api.registry.platformio.org/v3/packages/"
-        "platformio/tool/python-portable"
+        "platformio/tool/python-portable",
+        timeout=10,
     ).json()
     versions = [
         version
@@ -137,9 +138,10 @@ def check():
         raise exception.IncompatiblePythonError("Conda is not supported")
 
     try:
-        __import__("distutils.command")
+        __import__("venv")
+        # __import__("distutils.command")
     except ImportError:
-        raise exception.DistutilsNotFound()
+        raise exception.PythonVenvModuleNotFound()
 
     # portable Python 3 for macOS is not compatible with macOS < 10.13
     # https://github.com/platformio/platformio-core-installer/issues/70
@@ -175,7 +177,15 @@ def find_compatible_pythons(
     ignore_list = []
     for p in ignore_pythons or []:
         ignore_list.extend(glob.glob(p))
-    exenames = ["python3", "python"]
+    exenames = [
+        # "python3.11",
+        "python3.10",
+        "python3.9",
+        "python3.8",
+        "python3.7",
+        "python3",
+        "python",
+    ]
     if util.IS_WINDOWS:
         exenames = ["%s.exe" % item for item in exenames]
     log.debug("Current environment PATH %s", os.getenv("PATH"))
@@ -215,10 +225,10 @@ def find_compatible_pythons(
                 log.debug(error)
             except UnicodeDecodeError:
                 pass
-            if error and "Could not find distutils module" in error:
+            if error and "`venv` module" in error:
                 # pylint:disable=line-too-long
                 raise click.ClickException(
-                    """Can not install PlatformIO Core due to a missed `distutils` package in your Python installation.
+                    """Can not install PlatformIO Core due to a missed `venv` module in your Python installation.
 Please install this package manually using the OS package manager. For example:
 
 $ apt-get install python3-venv

pioinstaller/python.py

@@ -90,12 +90,12 @@ def safe_create_dir(path, raise_exception=False):
 
 def download_file(url, dst, cache=True):
     if cache:
-        content_length = requests.head(url).headers.get("Content-Length")
+        content_length = requests.head(url, timeout=10).headers.get("Content-Length")
         if os.path.isfile(dst) and content_length == os.path.getsize(dst):
             log.debug("Getting from cache: %s", dst)
             return dst
 
-    resp = requests.get(url, stream=True)
+    resp = requests.get(url, stream=True, timeout=10)
     itercontent = resp.iter_content(chunk_size=io.DEFAULT_BUFFER_SIZE)
     safe_create_dir(os.path.dirname(dst))
     with open(dst, "wb") as fp:

pioinstaller/util.py

@@ -36,12 +36,13 @@
     install_requires=[
         # Core
         "click==8.0.4",  # >8.0.4 does not support Python 3.6
-        "requests==2.27.1",
-        "colorama==0.4.5",
+        "urllib3<2", # issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+
+        "requests==2.31.0",
+        "colorama==0.4.6",
         "semantic-version==2.8.5",  # >2.8.5 does not support Python 3.6
-        "certifi==2022.6.15",
+        "certifi==2023.5.7",
         # Misc
-        "wheel==0.37.1",
+        "wheel==0.40.0",
     ],
     packages=find_packages(),
     entry_points={

setup.py

@@ -1,12 +1,9 @@
 # Copyright 2019-present PlatformIO Labs <[email protected]>
 
-[tox]
-envlist = py27,py35,py36,py37,py38,py39
-
 [testenv]
 usedevelop = True
 deps =
-    py35,py36,py37,py38,py39: black
+    black
     isort
     pylint
     pytest