Skip to content

Commit bd2e939

Browse files
committed
Rename "--version-requirements" to "--version-spec" for "check core"
1 parent b841463 commit bd2e939

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

pioinstaller/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ def python():
9090

9191
@check.command("core")
9292
@click.option("--auto-upgrade/--no-auto-upgrade", is_flag=True, default=True)
93-
@click.option("--version-requirements", default=None)
93+
@click.option("--version-spec", default=None)
9494
@click.option(
9595
"--dump-state",
9696
type=click.Path(
9797
exists=False, file_okay=True, dir_okay=True, writable=True, resolve_path=True
9898
),
9999
)
100100
@click.pass_context
101-
def core_check(ctx, auto_upgrade, version_requirements, dump_state):
101+
def core_check(ctx, auto_upgrade, version_spec, dump_state):
102102
try:
103103
state = core.check(
104104
dev=ctx.obj.get("dev", False),
105105
auto_upgrade=auto_upgrade,
106-
version_requirements=version_requirements,
106+
version_spec=version_spec,
107107
)
108108
if dump_state:
109109
core.dump_state(target=dump_state, state=state)

pioinstaller/core.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def install_platformio_core(shutdown_piohome=True, develop=False, ignore_pythons
119119
return True
120120

121121

122-
def check(dev=False, auto_upgrade=False, version_requirements=None):
122+
def check(dev=False, auto_upgrade=False, version_spec=None):
123123
# pylint: disable=bad-option-value, import-outside-toplevel, unused-import, import-error, unused-variable, cyclic-import
124124
from pioinstaller import penv
125125

@@ -166,18 +166,17 @@ def check(dev=False, auto_upgrade=False, version_requirements=None):
166166
}
167167
)
168168

169-
if version_requirements:
169+
if version_spec:
170170
try:
171171
if piocore_version in semantic_version.Spec(version_requirements):
172172
raise exception.InvalidPlatformIOCore(
173173
"PlatformIO Core version %s does not match version requirements %s."
174-
% (str(piocore_version), version_requirements)
174+
% (str(piocore_version), version_spec)
175175
)
176176
except ValueError:
177177
click.secho(
178178
"Invalid version requirements format: %s. "
179-
"More about Semantic Versioning: https://semver.org/"
180-
% version_requirements
179+
"More about Semantic Versioning: https://semver.org/" % version_spec
181180
)
182181

183182
with open(os.path.join(penv.get_penv_dir(), "state.json")) as fp:

0 commit comments

Comments
 (0)