Merge lp://qastaging/~noskcaj/ubuntu/vivid/webtest/merge into lp://qastaging/ubuntu/vivid/webtest
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/webtest/merge |
| Merge into: | lp://qastaging/ubuntu/vivid/webtest |
| Diff against target: |
444 lines (+213/-10) 17 files modified
CHANGELOG.rst (+15/-0) PKG-INFO (+1/-1) WebTest.egg-info/PKG-INFO (+1/-1) WebTest.egg-info/requires.txt (+1/-1) debian/changelog (+14/-0) debian/control (+1/-1) docs/changelog.rst (+15/-0) docs/testapp.rst (+2/-1) setup.cfg (+1/-1) setup.py (+1/-1) tests/test_app.py (+28/-0) tests/test_forms.py (+10/-0) tox.ini (+2/-0) webtest/app.py (+39/-1) webtest/compat.py (+78/-0) webtest/forms.py (+3/-1) webtest/http.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/webtest/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Revision history for this message
| Daniel Holbach (dholbach) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Revision history for this message
| Daniel Holbach (dholbach) wrote | # |
Unmerged revisions
- 24. By Jackson Doak
-
Fix target release
- 23. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- d/control: Demote python-lxml and python-pyquery to Suggests.
* New upstream release
* Standards-Version bumped to 3.9.6 (no changes needed)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.