diff options
| author | Erica Portnoy <ebportnoy@gmail.com> | 2020-06-17 04:01:58 +0300 |
|---|---|---|
| committer | Erica Portnoy <ebportnoy@gmail.com> | 2020-06-17 04:01:58 +0300 |
| commit | 4e9ab57efddd1d267515789765edfe0e9fe23870 (patch) | |
| tree | 73048b428d631c67b9e3387f7b5868cc4626fd1a | |
| parent | 6592098e2bda588e0861b21fb7756ae8e1122594 (diff) | |
| parent | c33090781bd4e9da05dcbe51dec381339b738e22 (diff) | |
Merge branch 'core20' into travis-test-bmw-core20travis-test-bmw-core20
| -rwxr-xr-x | snap/local/build_and_install.sh | 3 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 21 |
2 files changed, 5 insertions, 19 deletions
diff --git a/snap/local/build_and_install.sh b/snap/local/build_and_install.sh index 4330c762b..51cb6af21 100755 --- a/snap/local/build_and_install.sh +++ b/snap/local/build_and_install.sh @@ -13,7 +13,8 @@ sudo usermod -aG lxd "$USER" sudo /snap/bin/lxd.migrate -yes sudo /snap/bin/lxd waitready sudo /snap/bin/lxd init --auto -tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt > snap-constraints.txt +tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt \ + | grep -v python-augeas > snap-constraints.txt # Run snapcraft with the lxd group since it has not been added to the current # shell. sg lxd -c 'snapcraft --use-lxd' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5a51ce0f1..c3af77e49 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -37,26 +37,12 @@ apps: parts: - python-augeas: - plugin: python - source: git://github.com/basak/python-augeas - source-branch: snap - build-packages: [libaugeas-dev] - python-packages: - - wheel - stage: - - -pyvenv.cfg - - -**/__pycache__ - - -bin - - -**/RECORD - - -**/wheel - - -lib64 certbot: plugin: python source: . constraints: [$SNAPCRAFT_PART_SRC/snap-constraints.txt] python-packages: - - wheel + - git+https://github.com/basak/python-augeas.git@snap - ./acme - ./certbot - ./certbot-apache @@ -64,7 +50,7 @@ parts: stage: - -usr/lib/python3.8/sitecustomize.py # maybe unnecessary # Prefer cffi - - -lib/python3.8/site-packages/augeas.py # maybe unnecessary + - -lib/python3.8/site-packages/augeas.py stage-packages: - libaugeas0 # added to stage python: @@ -80,11 +66,10 @@ parts: - python3-pkg-resources - python3.8-minimal # To build cryptography and cffi if needed - build-packages: [libffi-dev, libssl-dev, git] + build-packages: [libffi-dev, libssl-dev, git, libaugeas-dev] override-pull: | snapcraftctl pull snapcraftctl set-version `cd $SNAPCRAFT_PART_SRC/certbot && git describe|sed s/^v//` - after: [python-augeas] wrappers: plugin: dump |