Merge lp:~cjwatson/isitdeployable/xenial into lp:isitdeployable
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 274 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | lp:~cjwatson/isitdeployable/xenial |
Merge into: | lp:isitdeployable |
Diff against target: |
93 lines (+11/-8) 6 files modified
Dockerfile (+1/-1) README (+4/-4) dependencies.txt (+1/-1) dependencies.txt.docker (+3/-1) ols-vms.conf (+1/-1) requirements.txt (+1/-0) |
To merge this branch: | bzr merge lp:~cjwatson/isitdeployable/xenial |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Kirkner (community) | Approve | ||
Review via email: mp+336858@code.launchpad.net |
Commit message
Upgrade to xenial. Install pygit2 using requirements.txt rather than dependencies.txt.
Description of the change
The pygit2 change is required because otherwise cffi tries to write into site-packages at run-time and gets rather confused; and adding python-setuptools and python-wheel is needed because those are Recommends of python-pip in xenial but without them (at least) html5lib fails to install. Otherwise this is pretty trivial, and I've prepared the dependencies PPA appropriately.
Requires https:/
To post a comment you must log in.
LGTM