Merge lp:~cjwatson/isitdeployable/xenial into lp:isitdeployable

[Colin Watson]

Upgrade to xenial. Install pygit2 using requirements.txt rather than dependencies.txt.

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://code.launchpad.net/~cjwatson/isitdeployable-dependencies/pygit2-0.24.2/+merge/336856.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'Dockerfile'
--- Dockerfile	2017-09-12 18:18:08 +0000
+++ Dockerfile	2018-01-30 15:44:22 +0000
@@ -1,4 +1,4 @@
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 
 # create non-root user
 RUN useradd -m -u 1000 ubuntu
 
=== modified file 'README'
--- README	2016-09-27 14:31:46 +0000
+++ README	2018-01-30 15:44:22 +0000
@@ -19,15 +19,15 @@
 We'll create a new container specifically for this project to isolate it from
 the system and other projects:
 
-   $ sudo lxc-create -t ubuntu -n deployable-trusty -- -r trusty -a amd64 -b $USER
+   $ sudo lxc-create -t ubuntu -n deployable-xenial -- -r xenial -a amd64 -b $USER
 
 Once it's created, lets start the container and log in with your
 existing credentials:
 
-   $ sudo lxc-start -n deployable-trusty -d
-   $ ssh -A deployable-trusty
+   $ sudo lxc-start -n deployable-xenial -d
+   $ ssh -A deployable-xenial
 
-From now on, instructions will assume you're inside the deployable-trusty LXC,
+From now on, instructions will assume you're inside the deployable-xenial LXC,
 unless otherwise noted.
 
 To set the prerequisites up inside the container, you can run the
 
=== modified file 'dependencies.txt'
--- dependencies.txt	2016-09-27 14:31:46 +0000
+++ dependencies.txt	2018-01-30 15:44:22 +0000
@@ -1,5 +1,6 @@
 gettext
 iso-codes
+libgit2-24
 librsvg2-common
 python3-apt
 python3-chardet
@@ -32,7 +33,6 @@
 python-piston-mini-client
 python-polib
 python-psycopg2
-python-pygit2
 python-pygooglechart
 python-reportlab
 python-restrictedpython
 
=== modified file 'dependencies.txt.docker'
--- dependencies.txt.docker	2017-09-01 14:11:18 +0000
+++ dependencies.txt.docker	2018-01-30 15:44:22 +0000
@@ -1,8 +1,10 @@
 bzr
 make
+libgit2-24
 libpq5
 openssh-client
 python-paramiko
 python-pip
-python-pygit2
+python-setuptools
+python-wheel
 ruby-compass
 
=== modified file 'ols-vms.conf'
--- ols-vms.conf	2017-08-08 14:48:15 +0000
+++ ols-vms.conf	2018-01-30 15:44:22 +0000
@@ -3,7 +3,7 @@
 vm.architecture = amd64
 
 [isitdeployable]
-vm.release = trusty
+vm.release = xenial
 vm.update = True
 # codetree and pygit2
 apt.sources = ppa:mojo-maintainers/ppa, ppa:ubuntuone/isitdeployable-dependencies
 
=== modified file 'requirements.txt'
--- requirements.txt	2018-01-29 15:34:06 +0000
+++ requirements.txt	2018-01-30 15:44:22 +0000
@@ -39,6 +39,7 @@
 Paste==1.7.5.1
 psycopg2==2.4.5
 pybars==0.0.4
+pygit2==0.24.2
 PyMeta==0.5.0
 pyinotify==0.9.3
 six==1.10.0