Merge branch 'release/v0.3.3'

Author: ivankravets

get-platformio.py

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

pioinstaller/__init__.py

@@ -36,34 +36,28 @@ def pack(target):
     if not os.path.isdir(os.path.dirname(target)):
         os.makedirs(os.path.dirname(target))
 
-    tmpdir = tempfile.mkdtemp()
-    create_wheels(os.path.dirname(util.get_source_dir()), tmpdir)
+    tmp_dir = tempfile.mkdtemp()
+    create_wheels(os.path.dirname(util.get_source_dir()), tmp_dir)
 
     new_data = io.BytesIO()
-    for whl in os.listdir(tmpdir):
-        with zipfile.ZipFile(os.path.join(tmpdir, whl)) as existing_zip:
+    for whl in os.listdir(tmp_dir):
+        with zipfile.ZipFile(os.path.join(tmp_dir, whl)) as existing_zip:
             with zipfile.ZipFile(new_data, mode="a") as new_zip:
                 for zinfo in existing_zip.infolist():
                     if re.search(r"\.dist-info/", zinfo.filename):
                         continue
                     new_zip.writestr(zinfo, existing_zip.read(zinfo))
     zipdata = base64.b64encode(new_data.getvalue()).decode("utf8")
     with open(target, "w") as fp:
-        with open(
-            os.path.join(util.get_source_dir(), "pack", "template.py"), "r"
-        ) as fp_template:
-            fp.write(
-                fp_template.read().format(
-                    installed_version="latest", zipfile_content=zipdata,
-                ),
-            )
+        with open(os.path.join(util.get_source_dir(), "pack", "template.py")) as fptlp:
+            fp.write(fptlp.read().format(zipfile_content=zipdata))
 
     # Ensure the permissions on the newly created file
     oldmode = os.stat(target).st_mode & 0o7777
     newmode = (oldmode | 0o555) & 0o7777
     os.chmod(target, newmode)
 
     # Clearing up
-    shutil.rmtree(tmpdir)
+    shutil.rmtree(tmp_dir)
 
     return target

pioinstaller/pack/packer.py

@@ -25,27 +25,43 @@
 """
 
 
+def create_temp_dir():
+    try:
+        cur_dir = os.path.dirname(os.path.realpath(__file__))
+        tmp_dir = tempfile.mkdtemp(dir=cur_dir, prefix=".piocore-installer-")
+        testscript_path = os.path.join(tmp_dir, "test.py")
+        with open(testscript_path, "w") as fp:
+            fp.write("print(1)")
+        assert os.path.isfile(testscript_path)
+        os.remove(testscript_path)
+        return tmp_dir
+    except (AssertionError, NameError):
+        pass
+    return tempfile.mkdtemp()
+
+
 def bootstrap():
     import pioinstaller.__main__
 
     pioinstaller.__main__.main()
 
 
 def main():
-    tmpdir = None
+    runtime_tmp_dir = create_temp_dir()
+    os.environ["TMPDIR"] = runtime_tmp_dir
+    tmp_dir = tempfile.mkdtemp(dir=runtime_tmp_dir)
     try:
-        tmpdir = tempfile.mkdtemp()
-
-        pioinstaller_zip = os.path.join(tmpdir, "pioinstaller.zip")
+        pioinstaller_zip = os.path.join(tmp_dir, "pioinstaller.zip")
         with open(pioinstaller_zip, "wb") as fp:
             fp.write(b64decode(DEPENDENCIES))
 
         sys.path.insert(0, pioinstaller_zip)
 
         bootstrap()
     finally:
-        if tmpdir:
-            shutil.rmtree(tmpdir, ignore_errors=True)
+        for d in (runtime_tmp_dir, tmp_dir):
+            if d and os.path.isdir(d):
+                shutil.rmtree(d, ignore_errors=True)
 
 
 if __name__ == "__main__":

pioinstaller/pack/template.py

@@ -123,7 +123,7 @@ def create_with_remote_venv(python_exe, penv_dir):
     venv_script_path = util.download_file(
         VIRTUALENV_URL,
         os.path.join(
-            os.path.dirname(penv_dir), "penv-tmp", os.path.basename(VIRTUALENV_URL)
+            os.path.dirname(penv_dir), ".cache", "tmp", os.path.basename(VIRTUALENV_URL)
         ),
     )
     if not venv_script_path:
@@ -166,7 +166,7 @@ def install_pip(python_exe, penv_dir):
 
         log.debug("Downloading 'get-pip.py' installer...")
         get_pip_path = os.path.join(
-            os.path.dirname(penv_dir), "penv-tmp", os.path.basename(PIP_URL)
+            os.path.dirname(penv_dir), ".cache", "tmp", os.path.basename(PIP_URL)
         )
         util.download_file(PIP_URL, get_pip_path)
 

pioinstaller/penv.py

@@ -69,7 +69,7 @@ def fetch_portable_python(dst):
         log.debug("Downloading portable python...")
 
         archive_path = util.download_file(
-            url, os.path.join(os.path.join(dst, "penv-tmp"), os.path.basename(url))
+            url, os.path.join(os.path.join(dst, ".cache", "tmp"), os.path.basename(url))
         )
 
         python_dir = os.path.join(dst, "python37")

pioinstaller/python.py

@@ -36,10 +36,10 @@
     install_requires=[
         # Core
         "click==7.1.2",
-        "requests==2.23.0",
+        "requests==2.24.0",
         "colorama==0.4.3",
         "semantic-version==2.8.5",
-        "certifi==2020.04.05.2",
+        "certifi==2020.6.20",
         # Misc
         "wheel==0.34.2",
     ],

setup.py

@@ -7,7 +7,7 @@ envlist = py27, py35, py36, py37, py38
 usedevelop = True
 deps =
     py35,py36,py37,py38: black
-    isort
+    isort<5
     pylint
     pytest
 commands =