Merge lp:~elopio/canonical-identity-provider/tox_and_py2+3 into lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient
Proposed by
Leo Arias
Status: | Merged |
---|---|
Approved by: | Leo Arias |
Approved revision: | no longer in the source branch. |
Merged at revision: | 18 |
Proposed branch: | lp:~elopio/canonical-identity-provider/tox_and_py2+3 |
Merge into: | lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient |
Diff against target: |
271 lines (+70/-32) 8 files modified
Makefile (+5/-10) ssoclient/__init__.py (+1/-1) ssoclient/tests/__init__.py (+0/-1) ssoclient/tests/test_v2.py (+35/-13) ssoclient/v2/client.py (+14/-6) ssoclient/v2/errors.py (+3/-1) ssoclient/v2/http.py (+3/-0) tox.ini (+9/-0) |
To merge this branch: | bzr merge lp:~elopio/canonical-identity-provider/tox_and_py2+3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Review via email:
|
Commit message
Made the code compatible with py2.7 and py3.3. All tests in tox passing for both environments.
Added tox to test in both environments.
To post a comment you must log in.
Looks good!