Skip to content

Commit 6289e38

Browse files
committed
fix: pr suggestions
1 parent 9611d8c commit 6289e38

File tree

3 files changed

+2769
-11712
lines changed

3 files changed

+2769
-11712
lines changed

charmcraft/application/commands/store.py

+8-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from craft_cli import ArgumentParsingError, emit
3939
from craft_cli.errors import CraftError
4040
from craft_parts import Step
41-
from craft_store import attenuations, models
41+
from craft_store import attenuations, models, publisher
4242
from craft_store.errors import CredentialsUnavailable
4343
from craft_store.models import ResponseCharmResourceBase
4444
from humanize import naturalsize
@@ -2382,18 +2382,12 @@ class CreateTrack(CharmcraftCommand):
23822382
name = "create-track"
23832383
help_msg = "Create one or more tracks for a charm on Charmhub"
23842384
overview = textwrap.dedent(
2385-
"""
2386-
Create one or more tracks for a charm on Charmhub. Returns
2387-
the full list of tracks for that charm.
2388-
2389-
For example:
2385+
"""\
2386+
Create one or more tracks for a charm on Charmhub.
23902387
2391-
$ charmcraft create-track my-charm track-1 track-2
2392-
Name Created at Automatic phasing percentage
2393-
--------- -------------------- ------------------------------
2394-
track-1 2024-12-10T23:48:40Z
2395-
track-2 2024-12-11T00:14:24Z
2396-
latest 2023-04-17T23:55:07Z
2388+
Returns the full list of tracks for that charm. Tracks must match an existing
2389+
guardrail for this charm. Guardrails can be requested in the charmhub requests
2390+
category at https://discourse.charmhub.io.
23972391
"""
23982392
)
23992393
format_option = True
@@ -2421,13 +2415,13 @@ def run(self, parsed_args: argparse.Namespace) -> None:
24212415
"""Run the command."""
24222416
emit.progress(f"Creating {len(parsed_args.track)} tracks on the store")
24232417
pct = parsed_args.automatic_phasing_percentage
2424-
tracks = [
2418+
tracks: list[publisher.CreateTrackRequest] = [
24252419
{"name": track, "automatic-phasing-percentage": pct}
24262420
for track in parsed_args.track
24272421
]
24282422
output_tracks = self._services.store.create_tracks(
24292423
parsed_args.name,
2430-
*tracks, # type: ignore[arg-type] # false positive in mypy
2424+
*tracks,
24312425
)
24322426

24332427
if fmt := parsed_args.format:

charmcraft/services/store.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import craft_application
2424
import craft_store
2525
from craft_cli import emit
26-
from craft_store import models, publishergateway
26+
from craft_store import models, publisher
2727
from overrides import override
2828

2929
from charmcraft import const, env, errors, store
@@ -198,15 +198,15 @@ def setup(self) -> None:
198198
host=self._base_url,
199199
environment_auth=self._environment_auth,
200200
)
201-
self._publisher = craft_store.publishergateway.PublisherGateway(
201+
self._publisher = craft_store.publisher.PublisherGateway(
202202
base_url=self._base_url,
203203
namespace="charm",
204204
auth=self._auth,
205205
)
206206

207207
def create_tracks(
208-
self, name: str, *tracks: publishergateway.CreateTrackRequest
209-
) -> Sequence[publishergateway.TrackMetadata]:
208+
self, name: str, *tracks: publisher.CreateTrackRequest
209+
) -> Sequence[publisher.TrackMetadata]:
210210
"""Create tracks in the store."""
211211
self._publisher.create_tracks(name, *tracks)
212212

0 commit comments

Comments
 (0)