Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

extensions/kde-neon: declare non-experimental for core20 #3598

Merged
merged 2 commits into from
Jan 10, 2022
Merged

extensions/kde-neon: declare non-experimental for core20 #3598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aac7f7c
extensions/kde-neon: declare non-experimental for core20
ppd Nov 24, 2021
14dbf6d
Merge branch 'main' into kde-neon-not-experimental
sergiusens Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions snapcraft/internal/project_loader/_extensions/kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Import types and tell flake8 to ignore the "unused" List.

from collections import namedtuple
from typing import Any, Dict, Optional, Tuple
from typing import Any, Dict, Tuple

from ._extension import Extension

Expand All @@ -35,7 +35,7 @@
cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current",
content="kde-frameworks-5-qt-5-15-3-core20-all",
provider="kde-frameworks-5-qt-5-15-3-core20",
build_snaps=["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/candidate"],
build_snaps=["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/stable"],
),
)

Expand Down Expand Up @@ -64,11 +64,6 @@ class ExtensionImpl(Extension):
- x11 (https://snapcraft.io/docs/x11-interface)
"""

@staticmethod
def is_experimental(base: Optional[str]) -> bool:
# TODO: remove experimental once sdk is on stable
return base == "core20"

@staticmethod
def get_supported_bases() -> Tuple[str, ...]:
return ("core18", "core20")
Expand Down
8 changes: 1 addition & 7 deletions tests/spread/extensions/kde-neon/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ restore: |

execute: |
cd "$SNAP_DIR"

if [[ "$SPREAD_SYSTEM" =~ ubuntu-20.04 ]]; then
output="$(snapcraft --enable-experimental-extensions)"
else
output="$(snapcraft)"
fi

output="$(snapcraft)"
snap install neon-hello_*.snap --dangerous

[ "$(neon-hello)" = "hello world" ]
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/project_loader/extensions/test_kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_extension_core20():
assert kde_neon_extension.parts == {
"kde-neon-extension": {
"build-packages": ["g++"],
"build-snaps": ["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/candidate"],
"build-snaps": ["kde-frameworks-5-qt-5-15-3-core20-sdk/latest/stable"],
"make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-qt-5-15-3-core20"],
"plugin": "make",
"source": "$SNAPCRAFT_EXTENSIONS_DIR/desktop",
Expand All @@ -137,7 +137,7 @@ def test_experimental_core20():
kde_neon_extension = ExtensionImpl(
extension_name="kde-neon", yaml_data=dict(base="core20")
)
assert kde_neon_extension.is_experimental(base="core20") is True
assert kde_neon_extension.is_experimental(base="core20") is False


def test_experimental_core18():
Expand Down