Merge branch 'main' into work/CRAFT-2479-deprecate-snap-command

canonical · Feb 21, 2024 · 5624231 · 5624231
2 parents bf4ffd8 + 0870df3
commit 5624231
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -18,7 +18,7 @@ craft-grammar==1.1.2
 craft-parts==1.26.2
 craft-providers==1.22.0
 craft-store==2.6.0
-cryptography==41.0.7
+cryptography==42.0.2
 Deprecated==1.2.14
 dill==0.3.7
 distlib==0.3.8

diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ craft-grammar==1.1.2
 craft-parts==1.26.2
 craft-providers==1.22.0
 craft-store==2.6.0
-cryptography==41.0.7
+cryptography==42.0.2
 Deprecated==1.2.14
 distro==1.9.0
 docutils==0.19

diff --git a/snapcraft/extensions/kde_neon.py b/snapcraft/extensions/kde_neon.py
@@ -25,7 +25,7 @@
 
 from .extension import Extension, get_extensions_data_dir, prepend_to_env
 
-_SDK_SNAP = {"core22": "kf5-5-108-qt-5-15-10-core22-sdk"}
+_SDK_SNAP = {"core22": "kf5-5-113-qt-5-15-11-core22-sdk"}
 
 
 @dataclasses.dataclass

diff --git a/tests/spread/extensions/kde-neon/task.yaml b/tests/spread/extensions/kde-neon/task.yaml
@@ -48,7 +48,7 @@ execute: |
   if [[ "$SPREAD_SYSTEM" =~ ubuntu-20.04 ]]; then
     snap list kde-frameworks-5-99-qt-5-15-7-core20
   elif [[ "$SPREAD_SYSTEM" =~ ubuntu-22.04 ]]; then
-    snap list kf5-5-108-qt-5-15-10-core22
+    snap list kf5-5-113-qt-5-15-11-core22
   fi
 
 

diff --git a/tests/unit/extensions/test_kde_neon.py b/tests/unit/extensions/test_kde_neon.py
@@ -54,7 +54,7 @@ def kde_neon_extension_with_default_build_snap_from_latest_edge():
             "base": "core22",
             "parts": {
                 "part1": {
-                    "build-snaps": ["kf5-5-108-qt-5-15-10-core22-sdk/latest/edge"]
+                    "build-snaps": ["kf5-5-113-qt-5-15-11-core22-sdk/latest/edge"]
                 }
             },
         },
@@ -111,10 +111,10 @@ def test_get_root_snippet(kde_neon_extension):
                 "target": "$SNAP/data-dir/sounds",
                 "default-provider": "gtk-common-themes",
             },
-            "kf5-5-108-qt-5-15-10-core22": {
-                "content": "kf5-5-108-qt-5-15-10-core22-all",
+            "kf5-5-113-qt-5-15-11-core22": {
+                "content": "kf5-5-113-qt-5-15-11-core22-all",
                 "interface": "content",
-                "default-provider": "kf5-5-108-qt-5-15-10-core22",
+                "default-provider": "kf5-5-113-qt-5-15-11-core22",
                 "target": "$SNAP/kf5",
             },
         },
@@ -174,19 +174,19 @@ def assert_get_part_snippet(kde_neon_instance):
             "build-environment": [
                 {
                     "PATH": (
-                        "/snap/kf5-5-108-qt-5-15-10-core22-sdk/current/usr/bin${PATH:+:$PATH}"
+                        "/snap/kf5-5-113-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH}"
                     )
                 },
                 {
                     "XDG_DATA_DIRS": (
-                        "$CRAFT_STAGE/usr/share:/snap/kf5-5-108-qt-5-15-10-core22-sdk"
+                        "$CRAFT_STAGE/usr/share:/snap/kf5-5-113-qt-5-15-11-core22-sdk"
                         "/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
                     )
                 },
                 {
                     "SNAPCRAFT_CMAKE_ARGS": (
                         "-DCMAKE_FIND_ROOT_PATH="
-                        "/snap/kf5-5-108-qt-5-15-10-core22-sdk/current"
+                        "/snap/kf5-5-113-qt-5-15-11-core22-sdk/current"
                         "${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
                     )
                 },
@@ -227,8 +227,8 @@ def test_get_parts_snippet(kde_neon_extension):
         "kde-neon/sdk": {
             "source": str(source),
             "plugin": "make",
-            "make-parameters": ["PLATFORM_PLUG=kf5-5-108-qt-5-15-10-core22"],
-            "build-snaps": ["kf5-5-108-qt-5-15-10-core22-sdk"],
+            "make-parameters": ["PLATFORM_PLUG=kf5-5-113-qt-5-15-11-core22"],
+            "build-snaps": ["kf5-5-113-qt-5-15-11-core22-sdk"],
         }
     }
 
@@ -255,7 +255,7 @@ def test_get_parts_snippet_with_external_sdk_different_channel(
             "kde-neon/sdk": {
                 "source": str(source),
                 "plugin": "make",
-                "make-parameters": ["PLATFORM_PLUG=kf5-5-108-qt-5-15-10-core22"],
+                "make-parameters": ["PLATFORM_PLUG=kf5-5-113-qt-5-15-11-core22"],
             }
         }
     )