diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6d16e04f0..fbdd32e02 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -127,7 +127,7 @@ parts: build-environment: # CFLAGS for Python 3.10 and libyaml. Allows cryptography and pyyaml to find # the appropriate system libraries. - - CFLAGS: "$(pkg-config python-3.10 yaml-0.1 --cflags)" + # - CFLAGS: "$(pkg-config python-3.10 yaml-0.1 --cflags)" # Build all packages from source. Prevents issues like #1369. # https://github.com/canonical/charmcraft/issues/1369 - PIP_NO_BINARY: ":all:" @@ -149,7 +149,9 @@ parts: rustup default 1.79 override-build: | uv venv --relocatable $CRAFT_PART_INSTALL - uv sync --no-dev --no-editable --extra apt-jammy + uv sync --no-dev --no-editable --no-binary + . $CRAFT_PART_INSTALL/bin/activate + uv pip install 'python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu4/python-apt_2.4.0ubuntu4.tar.xz' rm $CRAFT_PART_INSTALL/lib64 cp -v completion.bash $CRAFT_PART_INSTALL @@ -157,7 +159,7 @@ parts: mkdir -p $CRAFT_PART_INSTALL/libexec/charmcraft sed -i 's|#!/bin/sh|#!/snap/charmcraft/current/bin/python3|' $CRAFT_PART_INSTALL/bin/craftctl - version="$($CRAFT_PART_INSTALL/bin/charmcraft --version | cut -d' ' -f2)" + version="$(uv pip show charmcraft|grep "Version:" | cut -d' ' -f2)" /snap/snapcraft/current/libexec/snapcraft/craftctl set version="${version}" [ -n "$(echo $version | grep "post")" ] && grade=devel || grade=stable /snap/snapcraft/current/libexec/snapcraft/craftctl set grade="${grade}"