import from setuptools._vendor

This commit is contained in:
Erica Portnoy 2020-07-21 14:36:46 -07:00
parent 63db51a7ee
commit 0db2e17daf
2 changed files with 1 additions and 2 deletions

View file

@ -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" \

View file

@ -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