Merge lp:~cjwatson/launchpad/remove-funkload-webunit into lp:launchpad

[Colin Watson]

Remove funkload and webunit, which are no longer used.

These stopped being used as a result of https://code.launchpad.net/~jml/launchpad/flush-top-level/+merge/50374, but weren't completely cleaned up.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'buildout.cfg'
--- buildout.cfg	2017-05-08 12:39:30 +0000
+++ buildout.cfg	2017-05-11 14:52:17 +0000
@@ -38,7 +38,6 @@
 recipe = z3c.recipe.scripts
 eggs = lp
     celery
-    funkload
     zc.zservertracelog
     pyinotify
     lpjsmin
 
=== modified file 'setup.py'
--- setup.py	2017-05-08 11:56:10 +0000
+++ setup.py	2017-05-11 14:52:17 +0000
@@ -40,7 +40,6 @@
         'fixtures',
         'FeedParser',
         'feedvalidator',
-        'funkload',
         'html5browser',
         'httmock',
         'pygpgme',
 
=== modified file 'versions.cfg'
--- versions.cfg	2017-05-08 12:39:30 +0000
+++ versions.cfg	2017-05-11 14:52:17 +0000
@@ -37,7 +37,6 @@
 fixtures = 0.3.9
 flask = 0.10.1
 FormEncode = 1.2.4
-funkload = 1.16.1
 grokcore.component = 1.6
 gunicorn = 19.4.5
 html5browser = 0.0.9
@@ -151,7 +150,6 @@
 unittest2 = 0.5.1
 van.testing = 3.0.0
 wadllib = 1.3.2
-webunit = 1.3.10
 Werkzeug = 0.11.3
 # Upgrade from ZTK 1.1.5 to intercept lazr.restfulclient.
 wsgi-intercept = 0.5.1