From 0e12894d236a715922ad439558057cd7ff4bda33 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Fri, 26 May 2023 11:56:18 -0300 Subject: [PATCH] requirements: update craft-archives (#4174) --- requirements-devel.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- snapcraft_legacy/plugins/v1/catkin.py | 1 + snapcraft_legacy/plugins/v1/colcon.py | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index ff31914926..74eff9823c 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -11,7 +11,7 @@ click==8.1.3 codespell==2.2.4 colorama==0.4.6 coverage==7.2.5 -craft-archives==0.0.3 +craft-archives==1.0.0 craft-cli==1.2.0 craft-grammar==1.1.1 craft-parts==1.19.3 diff --git a/requirements.txt b/requirements.txt index 627a8cc899..159145b5b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ cffi==1.15.1 chardet==5.1.0 charset-normalizer==3.1.0 click==8.1.3 -craft-archives==0.0.3 +craft-archives==1.0.0 craft-cli==1.2.0 craft-grammar==1.1.1 craft-parts==1.19.3 diff --git a/setup.py b/setup.py index 768587f64c..b893e30c37 100755 --- a/setup.py +++ b/setup.py @@ -99,7 +99,7 @@ def recursive_data_files(directory, install_directory): install_requires = [ "attrs", "click", - "craft-archives==0.0.3", + "craft-archives", "craft-cli", "craft-grammar", "craft-parts", diff --git a/snapcraft_legacy/plugins/v1/catkin.py b/snapcraft_legacy/plugins/v1/catkin.py index 4a3be2162b..6571cee864 100644 --- a/snapcraft_legacy/plugins/v1/catkin.py +++ b/snapcraft_legacy/plugins/v1/catkin.py @@ -282,6 +282,7 @@ def get_required_package_repositories(self) -> List[PackageRepository]: return [ PackageRepositoryApt( + type="apt", formats=["deb"], components=["main"], key_id="C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654", diff --git a/snapcraft_legacy/plugins/v1/colcon.py b/snapcraft_legacy/plugins/v1/colcon.py index 73737be1ce..038a5268b2 100644 --- a/snapcraft_legacy/plugins/v1/colcon.py +++ b/snapcraft_legacy/plugins/v1/colcon.py @@ -231,6 +231,7 @@ def get_required_package_repositories(cls) -> List[PackageRepository]: codename = os_release.OsRelease().version_codename() return [ PackageRepositoryApt( + type="apt", formats=["deb"], components=["main"], key_id="C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654",