Merge lp://qastaging/~hopem/charm-helpers/lp1257763 into lp://qastaging/charm-helpers
Proposed by
Edward Hope-Morley
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~hopem/charm-helpers/lp1257763 | ||||
Merge into: | lp://qastaging/charm-helpers | ||||
Diff against target: |
156 lines (+66/-31) 6 files modified
.bzrignore (+1/-0) Makefile (+17/-8) README.test (+2/-9) test-requirements-precise.txt (+15/-0) test-requirements-trusty.txt (+8/-14) tox.ini (+23/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~hopem/charm-helpers/lp1257763 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jorge Niedbalski (community) | Needs Fixing | ||
Benjamin Saller (community) | Needs Fixing | ||
Cory Johns | Pending | ||
Kapil Thangavelu | Pending | ||
James Page | Pending | ||
charmers | Pending | ||
Review via email: mp+228685@code.qastaging.launchpad.net |
This proposal has been superseded by a proposal from 2014-09-01.
To post a comment you must log in.
Unmerged revisions
- 194. By Edward Hope-Morley
-
* allow DIST to be set in env
* added extra deps to README.test - 193. By Edward Hope-Morley
-
applied corey.bryant changes
- 192. By Edward Hope-Morley
-
synced lp:charm-helpers
- 191. By Edward Hope-Morley
-
synced trunk
- 190. By Edward Hope-Morley
-
added specific dirs to pep8 tox run
- 189. By Edward Hope-Morley
-
added tox version check
- 188. By Edward Hope-Morley
-
pep8/lint should always be trusty
- 187. By Edward Hope-Morley
-
synced trunk and resolved merge conflicts
- 186. By Edward Hope-Morley
-
Added support for distribition specific dependencies
We now default to current LTS but can switch to other dist deps if needed.
- 185. By Edward Hope-Morley
-
* don't use site-packages
* set versions to trusty
* need to do this prior run:
sudo apt-get build-dep python-launchpadlib
sudo apt-get build-dep python-apt
Interestingly I start seeing errors when using tox - lists seem to be out of order...