Skip to content

Commit

Permalink
repo: migrate to craft-archives (#4037)
Browse files Browse the repository at this point in the history
  • Loading branch information
lengau authored Mar 2, 2023
1 parent f2d7564 commit ce23bc7
Show file tree
Hide file tree
Showing 34 changed files with 28 additions and 4,547 deletions.
1 change: 1 addition & 0 deletions requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ click==8.1.3
codespell==2.2.2
colorama==0.4.6
coverage==7.0.4
craft-archives==0.0.1
craft-cli==1.2.0
craft-grammar==1.1.1
craft-parts==1.18.1
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cffi==1.15.1
chardet==5.1.0
charset-normalizer==2.1.1
click==8.1.3
craft-archives==0.0.1
craft-cli==1.2.0
craft-grammar==1.1.1
craft-parts==1.18.1
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def recursive_data_files(directory, install_directory):
install_requires = [
"attrs",
"click",
"craft-archives==0.0.1",
"craft-cli",
"craft-grammar",
"craft-parts",
Expand Down
3 changes: 2 additions & 1 deletion snapcraft/parts/parts.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
from typing import Any, Dict, List, Optional, Set

import craft_parts
from craft_archives import repo
from craft_cli import emit
from craft_parts import ActionType, Part, ProjectDirs, Step
from craft_parts.packages import Repository
from xdg import BaseDirectory # type: ignore

from snapcraft import errors, repo
from snapcraft import errors
from snapcraft.meta import ExtractedMetadata, extract_metadata
from snapcraft.utils import convert_architecture_deb_to_platform, get_host_architecture

Expand Down
3 changes: 2 additions & 1 deletion snapcraft/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union

import pydantic
from craft_archives import repo
from craft_grammar.models import GrammarSingleEntryDictList, GrammarStr, GrammarStrList
from pydantic import PrivateAttr, conlist, constr

from snapcraft import parts, repo
from snapcraft import parts
from snapcraft.errors import ProjectValidationError
from snapcraft.utils import get_effective_base, get_host_architecture

Expand Down
25 changes: 0 additions & 25 deletions snapcraft/repo/__init__.py

This file was deleted.

226 changes: 0 additions & 226 deletions snapcraft/repo/apt_key_manager.py

This file was deleted.

50 changes: 0 additions & 50 deletions snapcraft/repo/apt_ppa.py

This file was deleted.

Loading

0 comments on commit ce23bc7

Please sign in to comment.