Merge lp://staging/~jelmer/loggerhead/drop-python3 into lp://staging/loggerhead
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | no longer in the source branch. |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | 520 |
Proposed branch: | lp://staging/~jelmer/loggerhead/drop-python3 |
Merge into: | lp://staging/loggerhead |
Prerequisite: | lp://staging/~jelmer/loggerhead/fix-tox |
Diff against target: |
390 lines (+55/-105) 17 files modified
.travis.yml (+0/-2) loggerhead.wsgi (+2/-4) loggerhead/__init__.py (+1/-1) loggerhead/changecache.py (+2/-8) loggerhead/controllers/filediff_ui.py (+1/-11) loggerhead/controllers/view_ui.py (+1/-1) loggerhead/highlight.py (+1/-4) loggerhead/history.py (+1/-1) loggerhead/load_test.py (+1/-4) loggerhead/lsprof.py (+1/-4) loggerhead/main.py (+1/-4) loggerhead/tests/test_load_test.py (+1/-4) loggerhead/tests/test_simple.py (+2/-8) loggerhead/util.py (+3/-12) requirements.txt (+10/-11) setup.py (+24/-20) tox.ini (+3/-6) |
To merge this branch: | bzr merge lp://staging/~jelmer/loggerhead/drop-python3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+411875@code.staging.launchpad.net |
Commit message
Drop support for Python < 3 and Breezy < 3.1.
Description of the change
Drop support for Python < 3 and Breezy < 3.1.
To post a comment you must log in.
Same comment as in https:/ /code.launchpad .net/~jelmer/ loggerhead/ fix-tox/ +merge/ 411874 - could you adjust this to keep Python 3.5? I'll need to merge these two together, since something (probably a Breezy release or similar) has broken the Python 2 tests.
We'll need to upgrade Launchpad to Breezy >= 3.1, but that should be manageable now.