Skip to content

Commit

Permalink
requirements: bump some craft libs
Browse files Browse the repository at this point in the history
These are updates to use the new "streaming brief" feature from
craft-cli, but the feature itself is not enabled by this commit.
  • Loading branch information
tigarmo authored and sergiusens committed Aug 25, 2023
1 parent d5f9b89 commit ab554f7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
6 changes: 3 additions & 3 deletions requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ codespell==2.2.4
colorama==0.4.6
coverage==7.2.5
craft-archives==1.1.3
craft-cli==2.0.0
craft-cli==2.1.0
craft-grammar==1.1.1
craft-parts==1.23.1
craft-providers==1.13.0
craft-parts==1.24.0
craft-providers==1.15.0
craft-store==2.4.0
cryptography==41.0.3
Deprecated==1.2.13
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ chardet==5.1.0
charset-normalizer==3.1.0
click==8.1.3
craft-archives==1.1.3
craft-cli==2.0.0
craft-cli==2.1.0
craft-grammar==1.1.1
craft-parts==1.23.1
craft-providers==1.13.0
craft-parts==1.24.0
craft-providers==1.15.0
craft-store==2.4.0
cryptography==41.0.3
Deprecated==1.2.13
Expand Down
6 changes: 3 additions & 3 deletions snapcraft/commands/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import tempfile
import textwrap
from contextlib import contextmanager
from pathlib import Path
from pathlib import Path, PurePosixPath
from typing import Iterator, Optional

from craft_cli import BaseCommand, emit
Expand Down Expand Up @@ -309,7 +309,7 @@ def _install_snap(
is_dangerous = not bool(assert_file)

if assert_file:
ack_command = snap_cmd.formulate_ack_command(assert_file)
ack_command = snap_cmd.formulate_ack_command(PurePosixPath(assert_file))
emit.progress(
f"Installing assertion file with {shlex.join(ack_command)!r}."
)
Expand All @@ -327,7 +327,7 @@ def _install_snap(
install_command = snap_cmd.formulate_local_install_command(
classic=bool(snap_metadata.confinement == "classic"),
dangerous=is_dangerous,
snap_path=snap_file,
snap_path=PurePosixPath(snap_file),
)
if snap_metadata.grade == "devel":
install_command.append("--devmode")
Expand Down
11 changes: 11 additions & 0 deletions tests/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import yaml
from craft_providers import Executor, Provider
from craft_providers.base import Base
from overrides import override
from pymacaroons import Caveat, Macaroon

from snapcraft.extensions import extension, register, unregister
Expand Down Expand Up @@ -326,6 +327,16 @@ def fake_provider(mock_instance):
class FakeProvider(Provider):
"""Fake provider."""

@property
@override
def name(self) -> str:
return "fake"

@property
@override
def install_recommendation(self) -> str:
return "uninstallable"

def clean_project_environments(self, *, instance_name: str):
pass

Expand Down

0 comments on commit ab554f7

Please sign in to comment.