MAAS

Merge ~ack/maas:snap-pyc-fix into maas:master

  1. Git
  2. lp:~ack/maas
  3. snap-pyc-fix
  4. Merge into master
Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: 30831f0129f3c8edd2b8cc225deeef5ebaec58f9
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ack/maas:snap-pyc-fix
Merge into: maas:master
Diff against target: 31 lines (+1/-4)
1 file modified
snap/snapcraft.yaml (+1/-4)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Adam Collard (community) Approve
Review via email: mp+398184@code.launchpad.net

Commit message

LP: #1915869 - move python compileall back to prime, without prefix

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
Adam Collard (adam-collard) wrote :

Ah, for master can we remove the `set -e`'s too

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b snap-pyc-fix lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 30831f0129f3c8edd2b8cc225deeef5ebaec58f9

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 03eba67..5d3eef9 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -187,17 +187,15 @@ parts:
6 prime:
7 - $remove
8 override-build: |
9- set -e
10 snapcraftctl build
11 # If python3-netaddr contains absolute symlinks.
12 # See https://bugs.launchpad.net/snapcraft/+bug/1774410
13 ln -s -f ../../../../../../var/lib/ieee-data/oui.txt $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages/netaddr/eui/oui.txt
14 ln -s -f ../../../../../../var/lib/ieee-data/iab.txt $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages/netaddr/eui/iab.txt
15- python3 -m compileall -q .
16 override-prime: |
17- set -e
18 (cd $SNAPCRAFT_PART_SRC; snapcraftctl set-version $($SNAPCRAFT_PART_SRC/utilities/package-version))
19 snapcraftctl prime
20+ python3 -m compileall -j 0 -q .
21
22 ui:
23 plugin: npm
24@@ -209,7 +207,6 @@ parts:
25 # node-sass on non-amd64 needs python 2, see http://pad.lv/1867329
26 - python
27 override-build: |
28- set -e
29 snapcraftctl build
30 PATH="$PATH:$SNAPCRAFT_PART_BUILD/node_modules/.bin:$SNAPCRAFT_PART_INSTALL/bin"
31 NODE_ENV="production"

Subscribers

People subscribed via source and target branches