Merge ~d0ugal/maas-images:sitepackages-sadpanda into maas-images:master

Proposed by Dougal Matthews
Status: Merged
Merged at revision: d46e66037eb348f578fb90f59d3658bce6bd6898
Proposed branch: ~d0ugal/maas-images:sitepackages-sadpanda
Merge into: maas-images:master
Diff against target: 24 lines (+3/-1)
2 files modified
.gitignore (+2/-0)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+390179@code.launchpad.net

Commit message

Use sitepackages=true to get a more recent distro_info

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.gitignore b/.gitignore
index bee8a64..723482a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
1__pycache__1__pycache__
2.tox
3MANIFEST
diff --git a/tox.ini b/tox.ini
index 45c88a0..b1ab5a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,10 @@ recreate = False
44
5[testenv]5[testenv]
6basepython=python36basepython=python3
7sitepackages=true
7deps =8deps =
8 git+https://git.launchpad.net/simplestreams9 git+https://git.launchpad.net/simplestreams
9 pyyaml10 pyyaml
10 distro_info
1111
12setenv =12setenv =
13 LC_ALL = C13 LC_ALL = C

Subscribers

People subscribed via source and target branches