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

Proposed by Colin Watson
Status: Merged
Merged at revision: 18382
Proposed branch: lp:~cjwatson/launchpad/remove-funkload-webunit
Merge into: lp:launchpad
Diff against target: 43 lines (+0/-4)
3 files modified
buildout.cfg (+0/-1)
setup.py (+0/-1)
versions.cfg (+0/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-funkload-webunit
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+323915@code.launchpad.net

Commit message

Remove funkload and webunit, which are no longer used.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2017-05-08 12:39:30 +0000
3+++ buildout.cfg 2017-05-11 14:52:17 +0000
4@@ -38,7 +38,6 @@
5 recipe = z3c.recipe.scripts
6 eggs = lp
7 celery
8- funkload
9 zc.zservertracelog
10 pyinotify
11 lpjsmin
12
13=== modified file 'setup.py'
14--- setup.py 2017-05-08 11:56:10 +0000
15+++ setup.py 2017-05-11 14:52:17 +0000
16@@ -40,7 +40,6 @@
17 'fixtures',
18 'FeedParser',
19 'feedvalidator',
20- 'funkload',
21 'html5browser',
22 'httmock',
23 'pygpgme',
24
25=== modified file 'versions.cfg'
26--- versions.cfg 2017-05-08 12:39:30 +0000
27+++ versions.cfg 2017-05-11 14:52:17 +0000
28@@ -37,7 +37,6 @@
29 fixtures = 0.3.9
30 flask = 0.10.1
31 FormEncode = 1.2.4
32-funkload = 1.16.1
33 grokcore.component = 1.6
34 gunicorn = 19.4.5
35 html5browser = 0.0.9
36@@ -151,7 +150,6 @@
37 unittest2 = 0.5.1
38 van.testing = 3.0.0
39 wadllib = 1.3.2
40-webunit = 1.3.10
41 Werkzeug = 0.11.3
42 # Upgrade from ZTK 1.1.5 to intercept lazr.restfulclient.
43 wsgi-intercept = 0.5.1