Launchpad itself

Merge lp:~cjwatson/launchpad/remove-apiindex into lp:launchpad

  1. remove-apiindex
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18467
Proposed branch: lp:~cjwatson/launchpad/remove-apiindex
Merge into: lp:launchpad
Diff against target: 24 lines (+1/-2)
2 files modified
Makefile (+1/-1)
setup.py (+0/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-apiindex
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+331241@code.launchpad.net

Commit message

Remove vestiges of apiindex, most of which was removed in r10519.

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 'Makefile'
2--- Makefile 2017-09-23 03:09:58 +0000
3+++ Makefile 2017-09-26 03:13:51 +0000
4@@ -47,7 +47,7 @@
5 # NB: It's important BUILDOUT_BIN only mentions things genuinely produced by
6 # buildout.
7 BUILDOUT_BIN = \
8- $(PY) bin/apiindex bin/build-twisted-plugin-cache bin/bzr \
9+ $(PY) bin/build-twisted-plugin-cache bin/bzr \
10 bin/combine-css bin/fl-build-report \
11 bin/fl-credential-ctl bin/fl-install-demo bin/fl-monitor-ctl \
12 bin/fl-record bin/fl-run-bench bin/fl-run-test bin/googletestservice \
13
14=== modified file 'setup.py'
15--- setup.py 2017-09-23 03:13:41 +0000
16+++ setup.py 2017-09-26 03:13:51 +0000
17@@ -168,7 +168,6 @@
18 ),
19 entry_points=dict(
20 console_scripts=[ # `console_scripts` is a magic name to setuptools
21- 'apiindex = lp.scripts.utilities.apiindex:main',
22 'build-twisted-plugin-cache = '
23 'lp.services.twistedsupport.plugincache:main',
24 'bzr = lp.scripts.utilities.bzr:main',