test: use lxd for python symlink tests, update craft-parts

pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
     "craft-archives~=2.1",
     "craft-cli~=2.15.0",
     "craft-grammar>=2.0.1,<3.0.0",
-    "craft-parts==2.4.1",
+    "craft-parts==2.6.2",
     "craft-platforms~=0.6",
     "craft-providers~=2.1",
     "craft-store>=3.0.2,<4.0.0",

tests/spread/plugins/craft-parts/python-symlinks/bare-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/bare-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/classic-not-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/classic-not-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/classic-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/classic-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/devmode-not-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/devmode-not-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/devmode-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/devmode-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/provisioned-from-another-part/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/provisioned-from-another-part/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/strict-gnome-extension/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/strict-gnome-extension/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/strict-not-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/strict-not-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/strict-provisioned/src/hello/__init__.py

@@ -0,0 +1,2 @@
+def main():
+    print("hello world")

tests/spread/plugins/craft-parts/python-symlinks/strict-provisioned/src/setup.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from distutils.core import setup
+
+setup(
+    name="hello",
+    version="0.1",
+    entry_points={"console_scripts": ["hello=hello:main"]},
+    packages=["hello"],
+)

tests/spread/plugins/craft-parts/python-symlinks/task.yaml

@@ -26,18 +26,24 @@ environment:
   SNAP/strict_gnome_extension: strict-gnome-extension
 
 restore: |
+  unset SNAPCRAFT_BUILD_ENVIRONMENT
+
   cd "${SNAP}"
   snapcraft clean
   rm -f ./*.snap
+  rm -rf ./squashfs-root
 
 execute: |
+  unset SNAPCRAFT_BUILD_ENVIRONMENT
+
   cd "${SNAP}"
 
   if [ -f expected-symlink ]; then
-    snapcraft prime
-    ls -l prime/bin
-    [ -x prime/bin/hello ]
-    [ "$(readlink prime/bin/python3)" == "$(cat expected-symlink)" ]
+    snapcraft pack
+    unsquashfs ${SNAP}_1.0_amd64.snap
+    ls -l squashfs-root/bin
+    [ -x squashfs-root/bin/hello ]
+    [ "$(readlink squashfs-root/bin/python3)" == "$(cat expected-symlink)" ]
   else
-    snapcraft prime 2>&1 | MATCH "No suitable Python interpreter found, giving up."
-  fi 
+    snapcraft prime -v 2>&1 | MATCH "No suitable Python interpreter found, giving up."
+  fi

tests/unit/parts/plugins/test_python_plugin.py

@@ -79,7 +79,7 @@ def test_get_build_commands(plugin, new_dir):
             # look for python3.10
             basename=$(basename $(readlink -f ${{PARTS_PYTHON_VENV_INTERP_PATH}}))
             echo Looking for a Python interpreter called \\"${{basename}}\\" in the payload...
-            payload_python=$(find "$install_dir" "$stage_dir" -type f -executable -name "${{basename}}" -print -quit 2>/dev/null)
+            payload_python=$(find "$install_dir" "$stage_dir" -type f -executable -name "${{basename}}" -print -quit 2>/dev/null || true)
 
             if [ -n "$payload_python" ]; then
                 # We found a provisioned interpreter, use it.
@@ -94,12 +94,12 @@ def test_get_build_commands(plugin, new_dir):
                 fi
             else
                 # Otherwise use what _get_system_python_interpreter() told us.
-                echo "Python interpreter not found in payload."
+                echo "Python interpreter not found in payload." >&2
                 symlink_target="/usr/bin/python3.10"
             fi
 
             if [ -z "$symlink_target" ]; then
-                echo "No suitable Python interpreter found, giving up."
+                echo "No suitable Python interpreter found, giving up." >&2
                 exit 1
             fi