Merge branch 'release/v0.3.0'

Author: ivankravets

.appveyor.yml

@@ -13,10 +13,12 @@ environment:
 install:
   - cmd: git submodule update --init --recursive
   - cmd: SET PATH=C:\MinGW\bin;%PATH%
-  - cmd: pip install --force-reinstall tox
+  - cmd: pip install --force-reinstall tox pytest
 
 test_script:
   - cmd: tox
+  - cmd: python --version
+  - cmd: py.test --verbose --capture=no --exitfirst tests
 
 notifications:
   - provider: Slack

.travis.yml

@@ -1,27 +1,39 @@
-language: python
+language: generic
 
 matrix:
   include:
     - os: linux
+      dist: bionic
       sudo: required
-      python: 2.7
-      env: TOX_ENV=py27
+      env:
+        - TOX_ENV=py27
     - os: linux
+      dist: bionic
       sudo: required
-      python: 3.6
-      env: TOX_ENV=py36
+      env:
+        - TOX_ENV=py37
     - os: osx
-      language: generic
-      env: TOX_ENV=py27
+      env:
+        - TOX_ENV=py27
+    - os: osx
+      env:
+        - TOX_ENV=py37
 
 install:
-  - git submodule update --init --recursive
+  - if [[ "$TOX_ENV" == "py27" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv global 2.7; fi
+  - if [[ "$TOX_ENV" == "py37" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv global 3.7; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TOX_ENV" == "py27" ]]; then pyenv install 2.7.17; pyenv global 2.7.17; eval "$(pyenv init -)"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TOX_ENV" == "py37" ]]; then pyenv install 3.7.5; pyenv global 3.7.5; eval "$(pyenv init -)"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -fsSL https://bootstrap.pypa.io/get-pip.py | sudo python; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O /tmp/miniconda.sh; bash /tmp/miniconda.sh -b -p /tmp/miniconda; export MINICONDA="/tmp/miniconda/python"; else wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/miniconda.sh; bash /tmp/miniconda.sh -b -p /tmp/miniconda; export MINICONDA="/tmp/miniconda/python"; fi
-  - pip install -U tox
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O /tmp/miniconda.sh; bash /tmp/miniconda.sh -b -p /tmp/miniconda; export MINICONDA="/tmp/miniconda/bin/python"; else wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/miniconda.sh; bash /tmp/miniconda.sh -b -p /tmp/miniconda; export MINICONDA="/tmp/miniconda/bin/python"; fi
+  - python --version
+  - pip install -U tox pytest
+  - pip install -e .
 
 script:
+  - python --version
   - tox -e $TOX_ENV
+  - make test
 
 notifications:
   email: false
@@ -30,4 +42,4 @@ notifications:
     rooms:
       secure: GOUanPMgPnway2tjAblGgoI3FKJD4bM+1fzcpTi4Rutd58WOb9ejgEOTOtfPhrjuUfQt1SP04C5igMQa8o9fagmtI4PUleSC2b8aGivB18gyvMWH4uceHA645+ElulT45SPqkzTYeRsGjrjKD5O1D3JFk6lwFsfzQM5yZ2QSplpMvGG9IvGVfulNzCuSUa66fzzsSRgDWqAfc76s2o6YTF+/gngbxYgwjZp+dGuWOBhEvxEcKXAq4ohSCxPKzTqR87DzS+IMH/nt71hOFZyHRO+5sUDBIxiTyGCIesS9gYVrMgvjCFp8QHWYapj3E3CFaBC5XOE1r/DfNyHfvdqBn6zLwhZPtrflg3dfD8+uPbrwfYRihraUCdI0NiprJGYTSYyduJeg5MqHGD5saTQtpNAMZshxTTse7FcAYT7oYPGf2pxkAGkKfMZb/z3aAIDBQpcUIoWBuZURShFZ1qBmxtVaIiZ9Wm7fLvXXpmINn0xJNeCva57otv4RVWvPj3X5xhCFdshkUeaZndTZPF9RFoCf2FNIR9p4hKqVeBcvpEyMWg/BrczVeLy44NiLgzb8mBx87rU+M9Hxi6OUsCdpAJ4UgHtuQ6XeO0P380KSTDOULdOUuxvPcwoB3QyVxP8lxQNCCH+dFBbeRdQhbu7PYeTmKp0P7/omFiXEGdIycvY=
     on_failure: always
-    on_success: change
+    on_success: change

Makefile

@@ -10,7 +10,7 @@ format:
 	black --target-version py27 ./tests
 
 test:
-	py.test --verbose --capture=no --exitfirst -n 1 --dist=loadscope tests
+	py.test --verbose --capture=no --exitfirst tests
 
 before-commit: isort format lint test
 

README.rst

@@ -12,18 +12,10 @@ PlatformIO Core Installer
     :alt:  License
 
 
-Standalone installer for `PlatformIO Core <https://docs.platformio.org/en/latest/core/index.html>`_.
+A standalone installer for `PlatformIO Core <https://docs.platformio.org/page/core/index.html>`_.
 
 Usage
 -----
 
-1. Install the latest Python 3 following `this guide <https://docs.platformio.org/en/latest/faq.html#install-python-interpreter>`_ (for Windows)
-2. Save contents of https://raw.githubusercontent.com/platformio/platformio-core-installer/develop/get-platformio.py to ``get-platformio.py``
-3. Please open system terminal (``cmd.exe``) and run this command
-
-.. code-block::
-
-    python get-platformio.py
-
-
-More detailed documentation https://docs.platformio.org/page/core/installation.html#installer-script
+* `Installation Guide <https://docs.platformio.org/page/core/installation.html>`_
+* `Integration with custom applications (extensions, plugins) <https://docs.platformio.org/page/core/installation.htmll#integration-with-custom-applications-extensions-plugins>`_.

get-platformio.py

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

pioinstaller/__init__.py

@@ -45,7 +45,7 @@ def cli(
     ctx.obj["dev"] = dev
     if not ctx.invoked_subcommand:
         click.echo("Installer version: %s" % __version__)
-        click.echo("Platform: %s" % platform.platform())
+        click.echo("Platform: %s" % platform.platform(terse=True))
         click.echo("Python version: %s" % sys.version)
         click.echo("Python path: %s" % sys.executable)
         try:
@@ -92,21 +92,21 @@ def python():
 @click.option("--auto-upgrade/--no-auto-upgrade", is_flag=True, default=True)
 @click.option("--version-requirements", default=None)
 @click.option(
-    "--dump-state-path",
+    "--dump-state",
     type=click.Path(
         exists=False, file_okay=True, dir_okay=True, writable=True, resolve_path=True
     ),
 )
 @click.pass_context
-def core_check(ctx, auto_upgrade, version_requirements, dump_state_path):
+def core_check(ctx, auto_upgrade, version_requirements, dump_state):
     try:
         state = core.check(
             dev=ctx.obj.get("dev", False),
             auto_upgrade=auto_upgrade,
             version_requirements=version_requirements,
         )
-        if dump_state_path:
-            core.dump_state(target=dump_state_path, state=state)
+        if dump_state:
+            core.dump_state(target=dump_state, state=state)
         click.secho(
             "Found compatible PlatformIO Core %s -> %s"
             % (state.get("core_version"), state.get("platformio_exe")),

pioinstaller/__main__.py

@@ -12,13 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import io
 import json
 import logging
 import os
 import platform
 import subprocess
-import sys
 import time
 
 import click
@@ -122,13 +120,17 @@ def install_platformio_core(shutdown_piohome=True, develop=False, ignore_pythons
 
 
 def check(dev=False, auto_upgrade=False, version_requirements=None):
-
     # pylint: disable=bad-option-value, import-outside-toplevel, unused-import, import-error, unused-variable, cyclic-import
     from pioinstaller import penv
 
     platformio_exe = os.path.join(
         penv.get_penv_bin_dir(), "platformio.exe" if util.IS_WINDOWS else "platformio",
     )
+    python_exe = os.path.join(
+        penv.get_penv_bin_dir(), "python.exe" if util.IS_WINDOWS else "python"
+    )
+    result = {}
+
     if not os.path.isfile(platformio_exe):
         raise exception.InvalidPlatformIOCore(
             "PlatformIO executable not found in `%s`" % penv.get_penv_bin_dir()
@@ -141,18 +143,35 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
         )
 
     try:
-        # pylint: disable=bad-option-value, import-outside-toplevel, unused-import, import-error, unused-variable, cyclic-import
-        import platformio
-    except ImportError:
-        raise exception.InvalidPlatformIOCore("Could not import PlatformIO module")
+        result.update(fetch_python_state(python_exe))
+    except subprocess.CalledProcessError as e:
+        error = e.output.decode()
+        raise exception.InvalidPlatformIOCore(
+            "Could not import PlatformIO module. Error: %s" % error
+        )
+
+    piocore_version = convert_version(result.get("core_version"))
+    dev = dev or bool(piocore_version.prerelease if piocore_version else False)
+    result.update(
+        {
+            "core_dir": get_core_dir(),
+            "cache_dir": get_cache_dir(),
+            "penv_dir": penv.get_penv_dir(),
+            "penv_bin_dir": penv.get_penv_bin_dir(),
+            "platformio_exe": platformio_exe,
+            "installer_version": __version__,
+            "python_exe": python_exe,
+            "system": util.get_systype(),
+            "is_develop_core": dev,
+        }
+    )
 
-    pio_version = get_pio_version(platformio)
     if version_requirements:
         try:
-            if pio_version in semantic_version.Spec(version_requirements):
+            if piocore_version in semantic_version.Spec(version_requirements):
                 raise exception.InvalidPlatformIOCore(
                     "PlatformIO Core version %s does not match version requirements %s."
-                    % (str(pio_version), version_requirements)
+                    % (str(piocore_version), version_requirements)
                 )
         except ValueError:
             click.secho(
@@ -161,46 +180,28 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
                 % version_requirements
             )
 
-    state = None
-
     with open(os.path.join(penv.get_penv_dir(), "state.json")) as fp:
-        state = json.load(fp)
-        if state.get("platform") != platform.platform():
+        penv_state = json.load(fp)
+        if penv_state.get("platform") != platform.platform(terse=True):
             raise exception.InvalidPlatformIOCore(
                 "PlatformIO installed using another platform `%s`. Your platform: %s"
-                % (state.get("platform"), platform.platform())
+                % (penv_state.get("platform"), platform.platform(terse=True))
             )
 
     try:
         subprocess.check_output([platformio_exe, "--version"], stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
         error = e.output.decode()
         raise exception.InvalidPlatformIOCore(
-            "Could not run `%s --version`.\nError: %s" % (platformio, str(error))
+            "Could not run `%s --version`.\nError: %s" % (platformio_exe, str(error))
         )
 
-    dev = dev or bool(pio_version.prerelease)
-    result = {
-        "core_dir": get_core_dir(),
-        "cache_dir": get_cache_dir(),
-        "penv_dir": penv.get_penv_dir(),
-        "penv_bin_dir": penv.get_penv_bin_dir(),
-        "platformio_exe": platformio_exe,
-        "core_version": str(pio_version),
-        "installer_version": __version__,
-        "python_exe": os.path.join(
-            penv.get_penv_bin_dir(), "python.exe" if util.IS_WINDOWS else "python"
-        ),
-        "system": util.get_systype(),
-        "is_develop_core": dev,
-    }
-
     if not auto_upgrade:
         return result
 
     time_now = int(round(time.time()))
 
-    last_piocore_version_check = state.get("last_piocore_version_check")
+    last_piocore_version_check = penv_state.get("last_piocore_version_check")
 
     if (
         last_piocore_version_check
@@ -209,31 +210,43 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
         return result
 
     with open(os.path.join(penv.get_penv_dir(), "state.json"), "w") as fp:
-        state["last_piocore_version_check"] = time_now
-        json.dump(state, fp)
+        penv_state["last_piocore_version_check"] = time_now
+        json.dump(penv_state, fp)
 
     if not last_piocore_version_check:
         return result
 
     upgrade_core(platformio_exe, dev)
 
-    result["core_version"] = get_pio_version(platformio)
-
+    try:
+        result.update(fetch_python_state(python_exe))
+    except:  # pylint:disable=bare-except
+        raise exception.InvalidPlatformIOCore("Could not import PlatformIO module")
     return result
 
 
-def get_pio_version(platformio):
+def fetch_python_state(python_exe):
+    code = """import platform
+import json
+import platformio
+
+state = {
+   "core_version": platformio.__version__,
+   "python_version": platform.python_version()
+}
+print(json.dumps(state))
+"""
+    state = subprocess.check_output(
+        [python_exe, "-c", code,], stderr=subprocess.STDOUT,
+    )
+    return json.loads(state.decode())
+
+
+def convert_version(version):
     try:
-        if sys.version_info[0] == 3:
-            # pylint: disable=bad-option-value, import-outside-toplevel, unused-import, import-error, unused-variable, cyclic-import
-            import importlib
-
-            importlib.reload(platformio)  # pylint:disable=no-member
-        else:
-            reload(platformio)
-        return semantic_version.Version(util.pepver_to_semver(platformio.__version__))
+        return semantic_version.Version(util.pepver_to_semver(version))
     except:  # pylint:disable=bare-except
-        return platformio.__version__
+        return None
 
 
 def upgrade_core(platformio_exe, dev=False):
@@ -259,5 +272,5 @@ def dump_state(target, state):
     if not os.path.isdir(os.path.dirname(target)):
         os.makedirs(os.path.dirname(target))
 
-    with io.open(target, "w", encoding="utf-8") as fp:
+    with open(target, "w") as fp:
         json.dump(state, fp)

pioinstaller/core.py

@@ -65,8 +65,8 @@ def create_core_penv(penv_dir=None, ignore_pythons=None):
 
     if not result_dir:
         raise exception.PIOInstallerException(
-            "Could not create PIO Core Virtual Environment. "
-            "Please create it manually -> http://bit.ly/pio-core-virtualenv"
+            "Could not create PIO Core Virtual Environment. Please report to "
+            "https://github.com/platformio/platformio-core-installer/issues"
         )
 
     python_exe = os.path.join(
@@ -150,7 +150,7 @@ def add_state_info(python_exe, penv_dir):
         "created_on": int(round(time.time())),
         "python": {"path": python_exe, "version": python_version,},
         "installer_version": __version__,
-        "platform": platform.platform(),
+        "platform": platform.platform(terse=True),
     }
     with open(os.path.join(penv_dir, "state.json"), "w") as fp:
         json.dump(state, fp)

pioinstaller/penv.py

@@ -38,7 +38,10 @@
         "click==7.1.1",
         "requests==2.23.0",
         "colorama==0.4.3",
-        "semantic-version==2.8.4"
+        "semantic-version==2.8.4",
+        "certifi==2020.04.05.1",
+        # Misc
+        "wheel==0.34.2",
     ],
     packages=find_packages(),
     entry_points={