maas-images

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

  1. Git
  2. lp:~d0ugal/maas-images
  3. sitepackages-sadpanda
  4. Merge into 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
1diff --git a/.gitignore b/.gitignore
2index bee8a64..723482a 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1 +1,3 @@
6 __pycache__
7+.tox
8+MANIFEST
9diff --git a/tox.ini b/tox.ini
10index 45c88a0..b1ab5a8 100644
11--- a/tox.ini
12+++ b/tox.ini
13@@ -4,10 +4,10 @@ recreate = False
14
15 [testenv]
16 basepython=python3
17+sitepackages=true
18 deps =
19 git+https://git.launchpad.net/simplestreams
20 pyyaml
21- distro_info
22
23 setenv =
24 LC_ALL = C

Subscribers

People subscribed via source and target branches