Fix double venv error in tests. Resolve platformio#31 (platformio#46)

ShahRustam · ivankravets · web-flow · commit 6d89f1e49384 · 2020-04-06T20:13:12.000+03:00
* Attempt 1 * Attempt 2 * Attempt 3 * Attempt 4. Move env variable from miniconda to matrix * Attempt 5. Fix conda test * Attempt 6. return commented tests * Attempt 7. fix platform format in penv state * Attempt 8. fix platform * Attempt 9. try use generic for tests * Attempt 10 * Attempt 11 * Attempt 11 * Attempt 11 * Attempt 12 * Attempt 12 * Attempt 13 * Attempt 13 * Attempt 14 * Attempt 15 * Attempt 15 * Attempt 15 * Attempt 15 * Attempt 15 * Attempt 15 * Attempt 15 * Attempt 16 * Attempt 16 * Attempt 17 * Attempt 17 * Attempt 17 * Attempt 18 * Attempt 19 * Fix tests. Resolve platformio#31 Co-authored-by: Ivan Kravets <me@ikravets.com>
diff --git a/.appveyor.yml b/.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
diff --git a/.travis.yml b/.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
diff --git a/Makefile b/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
 
diff --git a/get-platformio.py b/get-platformio.py
diff --git a/pioinstaller/__main__.py b/pioinstaller/__main__.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:
diff --git a/pioinstaller/core.py b/pioinstaller/core.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import io
 import json
 import logging
 import os
@@ -183,10 +182,10 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
 
     with open(os.path.join(penv.get_penv_dir(), "state.json")) as fp:
         penv_state = json.load(fp)
-        if penv_state.get("platform") != platform.platform():
+        if penv_state.get("platform") != platform.platform(terse=True):
             raise exception.InvalidPlatformIOCore(
                 "PlatformIO installed using another platform `%s`. Your platform: %s"
-                % (penv_state.get("platform"), platform.platform())
+                % (penv_state.get("platform"), platform.platform(terse=True))
             )
 
     try:
@@ -273,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)
diff --git a/pioinstaller/penv.py b/pioinstaller/penv.py
@@ -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)
diff --git a/setup.py b/setup.py
@@ -39,7 +39,9 @@
         "requests==2.23.0",
         "colorama==0.4.3",
         "semantic-version==2.8.4",
-        "certifi==2020.04.05.1"
+        "certifi==2020.04.05.1",
+        # Misc
+        "wheel==0.34.2",
     ],
     packages=find_packages(),
     entry_points={
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -33,35 +33,35 @@ def test_install_pio_core(pio_installer_script, tmpdir, monkeypatch):
     )
     assert subprocess.check_call([python_exe, "-m", "platformio", "--version"]) == 0
 
-    # core_state_path = os.path.join(str(core_dir), "core-state.json")
-    # assert (
-    #     subprocess.check_call(
-    #         [
-    #             python_exe,
-    #             pio_installer_script,
-    #             "check",
-    #             "core",
-    #             "--dump-state=%s" % core_state_path,
-    #         ]
-    #     )
-    #     == 0
-    # )
-    # with open(core_state_path) as fp:
-    #     json_info = json.load(fp)
-    #     assert json_info.get("core_dir") == str(core_dir)
-    #     assert json_info.get("penv_dir") == penv_dir
-    #     assert json_info.get("installer_version") == __version__
-    #     assert json_info.get("system") == util.get_systype()
+    core_state_path = os.path.join(str(core_dir), "core-state.json")
+    assert (
+        subprocess.check_call(
+            [
+                "python",
+                pio_installer_script,
+                "check",
+                "core",
+                "--dump-state=%s" % core_state_path,
+            ]
+        )
+        == 0
+    )
+    with open(core_state_path) as fp:
+        json_info = json.load(fp)
+        assert json_info.get("core_dir") == str(core_dir)
+        assert json_info.get("penv_dir") == penv_dir
+        assert json_info.get("installer_version") == __version__
+        assert json_info.get("system") == util.get_systype()
 
-    # assert os.path.isfile(
-    #     os.path.join(
-    #         penv.get_penv_bin_dir(penv_dir),
-    #         "platformio.exe" if util.IS_WINDOWS else "platformio",
-    #     )
-    # )
-    # assert os.path.isfile(
-    #     os.path.join(str(core_dir), "packages", "contrib-piohome", "package.json")
-    # )
-    # assert os.path.isfile(
-    #     os.path.join(str(core_dir), "packages", "contrib-pysite", "package.json")
-    # )
+    assert os.path.isfile(
+        os.path.join(
+            penv.get_penv_bin_dir(penv_dir),
+            "platformio.exe" if util.IS_WINDOWS else "platformio",
+        )
+    )
+    assert os.path.isfile(
+        os.path.join(str(core_dir), "packages", "contrib-piohome", "package.json")
+    )
+    assert os.path.isfile(
+        os.path.join(str(core_dir), "packages", "contrib-pysite", "package.json")
+    )
diff --git a/tox.ini b/tox.ini
@@ -10,9 +10,8 @@ deps =
     isort
     pylint
     pytest
-    pytest-xdist
 commands =
     {envpython} --version
     pioinstaller --version
     pylint --rcfile=./.pylintrc ./pioinstaller
-    py.test --exitfirst tests
+    # py.test --exitfirst tests

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ def add_state_info(python_exe, penv_dir):`
`150`	`150`	`"created_on": int(round(time.time())),`
`151`	`151`	`"python": {"path": python_exe, "version": python_version,},`
`152`	`152`	`"installer_version": __version__,`
`153`		`- "platform": platform.platform(),`
	`153`	`+ "platform": platform.platform(terse=True),`
`154`	`154`	`}`
`155`	`155`	`with open(os.path.join(penv_dir, "state.json"), "w") as fp:`
`156`	`156`	`json.dump(state, fp)`