Skip to content

Commit 2a29490

Browse files
committed
Merge branch 'release/v1.0.3'
2 parents b4c7dba + 32f8a8e commit 2a29490

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ lint:
22
pylint --rcfile=./.pylintrc ./pioinstaller
33

44
isort:
5-
isort -rc ./pioinstaller
6-
isort -rc ./tests
5+
isort ./tests
6+
isort ./pioinstaller
77

88
format:
99
black --target-version py27 ./pioinstaller

get-platformio.py

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pioinstaller/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import logging.config
1616

17-
VERSION = (1, 0, 2)
17+
VERSION = (1, 0, 3)
1818
__version__ = ".".join([str(s) for s in VERSION])
1919

2020
__title__ = "platformio-installer"

pioinstaller/python.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ def find_compatible_pythons(
211211
log.debug(output.decode().strip())
212212
except UnicodeDecodeError:
213213
pass
214-
except subprocess.CalledProcessError as e: # pylint:disable=bare-except
214+
except subprocess.CalledProcessError as e:
215+
error = None
215216
try:
216217
error = e.output.decode()
217218
log.debug(error)
218219
except UnicodeDecodeError:
219220
pass
220-
error = error or ""
221-
if "Could not find distutils module" in error:
221+
if error and "Could not find distutils module" in error:
222222
# pylint:disable=line-too-long
223223
raise click.ClickException(
224224
"""Can not install PlatformIO Core due to a missed `distutils` package in your Python installation.
@@ -228,6 +228,8 @@ def find_compatible_pythons(
228228
229229
(MAY require administrator access `sudo`)""",
230230
)
231+
except Exception as e: # pylint: disable=broad-except
232+
log.debug(e)
231233

232234
if not result and raise_exception:
233235
raise exception.IncompatiblePythonError(

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
license=__license__,
3636
install_requires=[
3737
# Core
38-
"click==7.1.2",
39-
"requests==2.25.1",
38+
"click==8.0.1",
39+
"requests==2.26.0",
4040
"colorama==0.4.4",
4141
"semantic-version==2.8.5",
42-
"certifi==2020.12.5",
42+
"certifi==2021.5.30",
4343
# Misc
44-
"wheel==0.36.2",
44+
"wheel==0.37.0",
4545
],
4646
packages=find_packages(),
4747
entry_points={

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ envlist = py27,py35,py36,py37,py38,py39
77
usedevelop = True
88
deps =
99
py35,py36,py37,py38,py39: black
10-
isort<5
10+
isort
1111
pylint
1212
pytest
1313
commands =

0 commit comments

Comments
 (0)