Merge branch 'release/v0.3.1'

Author: ivankravets

.appveyor.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Check Python
+        run: |
+          python -V
+          which python
+          echo $PATH
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U tox pytest
+          pip install -e .
+      - name: Python Lint
+        run: |
+          tox -e lint
+      - 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 }}

.github/workflows/main.yml

@@ -12,20 +12,15 @@ format:
 test:
 	py.test --verbose --capture=no --exitfirst tests
 
-before-commit: isort format lint test
+pack:
+	pioinstaller pack
+
+before-commit: isort format lint
 
 clean:
 	find . -name \*.pyc -delete
 	find . -name __pycache__ -delete
 	rm -rf .cache
-	rm -rf build
-	rm -rf htmlcov
-	rm -f .coverage
-
-profile:
-	# Usage $ > make PIOARGS="boards" profile
-	python -m cProfile -o .tox/.tmp/cprofile.prof $(shell which platformio) ${PIOARGS}
-	snakeviz .tox/.tmp/cprofile.prof
 
 publish:
 	python setup.py sdist upload

.travis.yml

@@ -1,12 +1,10 @@
 PlatformIO Core Installer
 =========================
 
-.. image:: https://travis-ci.org/platformio/platformio-core-installer.svg?branch=develop
-    :target: https://travis-ci.org/platformio/platformio-core-installer
-    :alt: Travis.CI Build Status
-.. image:: https://ci.appveyor.com/api/projects/status/2crg7e2oxutmk07r/branch/develop?svg=true
-    :target: https://ci.appveyor.com/project/ivankravets/platformio-core-installer
-    :alt: AppVeyor.CI Build Status
+
+.. image:: https://github.com/platformio/platformio-core-installer/workflows/CI/badge.svg
+    :target: https://docs.platformio.org/en/latest/core/installation.html
+    :alt:  CI Build
 .. image:: https://img.shields.io/badge/license-Apache%202.0-blue.svg
     :target: https://pypi.python.org/pypi/platformio/
     :alt:  License

Makefile

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

README.rst

@@ -90,23 +90,23 @@ def python():
 
 @check.command("core")
 @click.option("--auto-upgrade/--no-auto-upgrade", is_flag=True, default=True)
-@click.option("--version-requirements", default=None)
+@click.option("--version-spec", default=None)
 @click.option(
     "--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):
+def core_check(ctx, auto_upgrade, version_spec, dump_state):
     try:
         state = core.check(
             dev=ctx.obj.get("dev", False),
             auto_upgrade=auto_upgrade,
-            version_requirements=version_requirements,
+            version_spec=version_spec,
         )
         if dump_state:
-            core.dump_state(target=dump_state, state=state)
+            core.dump_state(target=str(dump_state), state=state)
         click.secho(
             "Found compatible PlatformIO Core %s -> %s"
             % (state.get("core_version"), state.get("platformio_exe")),

get-platformio.py

@@ -35,19 +35,21 @@ def get_core_dir():
         return os.getenv("PLATFORMIO_CORE_DIR")
 
     core_dir = os.path.join(util.expanduser("~"), ".platformio")
-    if not util.IS_WINDOWS or not util.has_non_ascii_char(core_dir):
+    if not util.IS_WINDOWS:
         return core_dir
 
     win_core_dir = os.path.splitdrive(core_dir)[0] + "\\.platformio"
-    if not os.path.isdir(win_core_dir):
-        try:
+    if os.path.isdir(win_core_dir):
+        return win_core_dir
+    try:
+        if util.has_non_ascii_char(core_dir):
             os.makedirs(win_core_dir)
             with open(os.path.join(win_core_dir, "file.tmp"), "w") as fp:
                 fp.write("test")
             os.remove(os.path.join(win_core_dir, "file.tmp"))
             return win_core_dir
-        except:  # pylint:disable=bare-except
-            pass
+    except:  # pylint:disable=bare-except
+        pass
 
     return core_dir
 
@@ -119,7 +121,7 @@ def install_platformio_core(shutdown_piohome=True, develop=False, ignore_pythons
     return True
 
 
-def check(dev=False, auto_upgrade=False, version_requirements=None):
+def check(dev=False, auto_upgrade=False, version_spec=None):
     # pylint: disable=bad-option-value, import-outside-toplevel, unused-import, import-error, unused-variable, cyclic-import
     from pioinstaller import penv
 
@@ -166,18 +168,17 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
         }
     )
 
-    if version_requirements:
+    if version_spec:
         try:
-            if piocore_version in semantic_version.Spec(version_requirements):
+            if piocore_version not in semantic_version.Spec(version_spec):
                 raise exception.InvalidPlatformIOCore(
                     "PlatformIO Core version %s does not match version requirements %s."
-                    % (str(piocore_version), version_requirements)
+                    % (str(piocore_version), version_spec)
                 )
         except ValueError:
             click.secho(
                 "Invalid version requirements format: %s. "
-                "More about Semantic Versioning: https://semver.org/"
-                % version_requirements
+                "More about Semantic Versioning: https://semver.org/" % version_spec
             )
 
     with open(os.path.join(penv.get_penv_dir(), "state.json")) as fp:

pioinstaller/__init__.py

@@ -28,9 +28,9 @@
 
 PORTABLE_PYTHONS = {
     "windows_x86": "https://dl.bintray.com/platformio/dl-misc/"
-    "python-portable-windows_x86-3.7.6.tar.gz",
+    "python-portable-windows_x86-3.7.7.tar.gz",
     "windows_amd64": "https://dl.bintray.com/platformio/dl-misc/"
-    "python-portable-windows_amd64-3.7.6.tar.gz",
+    "python-portable-windows_amd64-3.7.7.tar.gz",
 }