Merge lp://staging/~whitmo/charm-helpers/add-tox-and-isolation into lp://staging/charm-helpers
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~whitmo/charm-helpers/add-tox-and-isolation |
| Merge into: | lp://staging/charm-helpers |
| Diff against target: |
183 lines (+88/-39) 6 files modified
.bzrignore (+2/-0) .dockerignore (+3/-0) Makefile (+15/-39) setup.py (+2/-0) testing.docker (+6/-0) tox.ini (+60/-0) |
| To merge this branch: | bzr merge lp://staging/~whitmo/charm-helpers/add-tox-and-isolation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Tox, isolation testing, setuptools
The main purpose of this branch was to replace the virtualenv management in the makefile with the test runner tox for better standardization on modern python testing tools. Tox will now run the lint and tests for python2.7 and python3.4.
In the course of testing these changes for proper isolation, I added the make target "isotest" which builds a trusty image containing only charm-helpers and make, then runs the tests. Note: this depends on a fairly recent docker version, probably more recent than stable.
I also updated the setup.py to use setuptools properly, which fixed several issues across environments w/ tox (which runs sdist as part of it's testing).
Unmerged revisions
- 435. By Whit Morriss
-
Move tests and lint over to using tox.\n Add docker file and make target 'isotest' for testing against a bare instance.\n Use setuptools because it's 2015
- 434. By Whit Morriss
-
Move from make driving venv creation to using tox
