From 0db2e17dafaacfee40f069d853b3e4bd17465b15 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Tue, 21 Jul 2020 14:36:46 -0700 Subject: [PATCH] import from setuptools._vendor --- certbot-dns-dnsimple/snap/hooks/post-refresh | 2 +- certbot-dns-dnsimple/snap/snapcraft.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/certbot-dns-dnsimple/snap/hooks/post-refresh b/certbot-dns-dnsimple/snap/hooks/post-refresh index fc1e6667b..5128b8adf 100644 --- a/certbot-dns-dnsimple/snap/hooks/post-refresh +++ b/certbot-dns-dnsimple/snap/hooks/post-refresh @@ -12,7 +12,7 @@ cb_installed=$(cat $SNAP/certbot-shared/certbot-version.txt) cb_required=$(grep -oP "version = '\K.*(?=')" $SNAP/setup.py) -python3 -c "import sys; from packaging import version; sys.exit(1) if\ +python3 -c "import sys; from setuptools._vendor.packaging import version; sys.exit(1) if\ version.parse('$cb_installed') < version.parse('$cb_required') else sys.exit(0)" || exit_code=$? if [ "$exit_code" -eq 1 ]; then echo "Certbot is version $cb_installed but needs to be at least $cb_required before" \ diff --git a/certbot-dns-dnsimple/snap/snapcraft.yaml b/certbot-dns-dnsimple/snap/snapcraft.yaml index a8b630bfe..ebbafd432 100644 --- a/certbot-dns-dnsimple/snap/snapcraft.yaml +++ b/certbot-dns-dnsimple/snap/snapcraft.yaml @@ -20,7 +20,6 @@ parts: plugin: dump source: . stage: [setup.py, certbot-shared] - stage-packages: [python3-packaging] override-pull: | snapcraftctl pull mkdir -p $SNAPCRAFT_PART_SRC/certbot-shared