Skip to content

Commit

Permalink
Merge branch 'release/v1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Jul 10, 2023
2 parents dec480e + 26aa3e8 commit f8e30a0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
8 changes: 5 additions & 3 deletions get-platformio.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pioinstaller/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import logging.config

VERSION = (1, 1, 3)
VERSION = (1, 2, 0)
__version__ = ".".join([str(s) for s in VERSION])

__title__ = "platformio-installer"
Expand Down
6 changes: 4 additions & 2 deletions pioinstaller/pack/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@

def create_temp_dir():
try:
cur_dir = os.path.dirname(os.path.realpath(__file__))
tmp_dir = tempfile.mkdtemp(dir=cur_dir, prefix=".piocore-installer-")
parent_dir = os.getenv(
"PLATFORMIO_INSTALLER_TMPDIR", os.path.dirname(os.path.realpath(__file__))
)
tmp_dir = tempfile.mkdtemp(dir=parent_dir, prefix=".piocore-installer-")
testscript_path = os.path.join(tmp_dir, "test.py")
with open(testscript_path, "w") as fp:
fp.write("print(1)")
Expand Down
1 change: 1 addition & 0 deletions pioinstaller/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ def check():
raise exception.IncompatiblePythonError("Conda is not supported")

try:
__import__("ensurepip")
__import__("venv")
# __import__("distutils.command")
except ImportError:
Expand Down

0 comments on commit f8e30a0

Please sign in to comment.