Skip to content

Commit

Permalink
Merge branch 'release/v1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Feb 11, 2022
2 parents 805a927 + 0ff1f1f commit 388b53b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ isort:
isort ./pioinstaller

format:
black --target-version py27 ./pioinstaller
black --target-version py27 ./tests
black ./pioinstaller
black ./tests

test:
py.test --verbose --capture=no --exitfirst tests
Expand Down
2 changes: 1 addition & 1 deletion 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, 0)
VERSION = (1, 1, 1)
__version__ = ".".join([str(s) for s in VERSION])

__title__ = "platformio-installer"
Expand Down
4 changes: 2 additions & 2 deletions pioinstaller/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ def check(develop=False, global_=False, auto_upgrade=False, version_spec=None):
"PlatformIO executable not found in `%s`" % penv.get_penv_bin_dir()
)
try:
subprocess.check_output([platformio_exe, "--version"], stderr=subprocess.STDOUT)
subprocess.check_output([platformio_exe, "--help"], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
error = e.output.decode()
raise exception.InvalidPlatformIOCore(
"Could not run `%s --version`.\nError: %s" % (platformio_exe, str(error))
"Could not run `%s --help`.\nError: %s" % (platformio_exe, str(error))
)

result = {}
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
install_requires=[
# Core
"click==8.0.3",
"requests==2.26.0",
"requests==2.27.1",
"colorama==0.4.4",
"semantic-version==2.8.5",
"certifi==2021.10.8",
# Misc
"wheel==0.37.0",
"wheel==0.37.1",
],
packages=find_packages(),
entry_points={
Expand Down

0 comments on commit 388b53b

Please sign in to comment.