Merge branch 'release/v1.1.2'

Author: ivankravets

.github/workflows/main.yml

@@ -12,6 +12,8 @@ jobs:
         exclude:
           - os: macos-latest
             python-version: "3.6"
+          - os: windows-latest
+            python-version: "3.6"            
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.pylintrc

@@ -10,7 +10,6 @@ disable=
     ungrouped-imports,
     invalid-name,
     duplicate-code,
-    bad-continuation,
     fixme,
     arguments-differ,
     useless-object-inheritance,

get-platformio.py

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

pioinstaller/__init__.py

@@ -232,13 +232,22 @@ def _check_core_version(piocore_version, version_spec):
 def _check_platform_version():
     from pioinstaller import penv
 
-    state = penv.load_state()
-    if state.get("platform") != platform.platform(terse=True):
-        raise exception.InvalidPlatformIOCore(
-            "PlatformIO Core was installed using another platform `%s`. "
-            "Your current platform: %s"
-            % (state.get("platform"), platform.platform(terse=True))
-        )
+    platform_state = penv.load_state().get("platform")
+    if not platform_state or not isinstance(platform_state, dict):
+        raise exception.PIOInstallerException("Broken platform state")
+    if platform_state.get("platform") == platform.platform(terse=True):
+        return True
+    release_state = platform_state.get("release")
+    if (
+        release_state
+        and release_state.split(".")[0] == (platform.release() or "").split(".")[0]
+    ):
+        return True
+    raise exception.InvalidPlatformIOCore(
+        "PlatformIO Core was installed using another platform `%s`. "
+        "Your current platform: %s"
+        % (platform_state.get("platform"), platform.platform(terse=True))
+    )
 
 
 def fetch_python_state(python_exe):

pioinstaller/core.py

@@ -86,10 +86,10 @@ def create_virtualenv(python_exe, penv_dir):
         )
         try:
             return create_with_remote_venv(python_exe, penv_dir)
-        except Exception as e:  # pylint:disable=broad-except
+        except Exception as exc:  # pylint:disable=broad-except
             log.debug(
                 "Could not create virtualenv with downloaded script. Error: %s",
-                str(e),
+                str(exc),
             )
     return None
 
@@ -151,7 +151,10 @@ def init_state(python_exe, penv_dir):
             "version": python_version,
         },
         "installer_version": __version__,
-        "platform": platform.platform(terse=True),
+        "platform": {
+            "platform": platform.platform(),
+            "release": platform.release(),
+        },
     }
     return save_state(state, penv_dir)
 

pioinstaller/penv.py

@@ -186,10 +186,7 @@ def find_compatible_pythons(
                 continue
             candidates.append(os.path.join(path, exe))
     if sys.executable not in candidates:
-        if sys.version_info >= (3,):
-            candidates.insert(0, sys.executable)
-        else:
-            candidates.append(sys.executable)
+        candidates.insert(0, sys.executable)
     result = []
     for item in candidates:
         if item in ignore_list:

pioinstaller/python.py

@@ -35,11 +35,11 @@
     license=__license__,
     install_requires=[
         # Core
-        "click==8.0.3",
+        "click==8.0.4",  # >8.0.4 does not support Python 3.6
         "requests==2.27.1",
-        "colorama==0.4.4",
-        "semantic-version==2.8.5",
-        "certifi==2021.10.8",
+        "colorama==0.4.5",
+        "semantic-version==2.8.5",  # >2.8.5 does not support Python 3.6
+        "certifi==2022.6.15",
         # Misc
         "wheel==0.37.1",
     ],