launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/simplify-buildout-recipes into lp:launchpad with lp:~cjwatson/launchpad/disable-pot-generation as a prerequisite.

Commit message:
Consolidate scripts, iharness, txlongpoll, and txpkgupload buildout recipes into a single scripts recipe.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/simplify-buildout-recipes/+merge/330159

We don't gain much from carefully separating out different subsets of packages in sys.path for different programs, and doing so with pip would be extremely slow since it would require creating multiple virtualenvs.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/simplify-buildout-recipes into lp:launchpad.

=== modified file 'buildout.cfg'
--- buildout.cfg	2017-09-04 13:17:45 +0000
+++ buildout.cfg	2017-09-04 13:17:45 +0000
@@ -5,9 +5,6 @@
 parts =
     scripts
     tags
-    iharness
-    txlongpoll
-    txpkgupload
 unzip = true
 eggs-directory = eggs
 download-cache = download-cache
@@ -37,11 +34,11 @@
 recipe = z3c.recipe.scripts
 eggs = lp
     celery
-    zc.zservertracelog
-    pyinotify
-    lpjsmin
     jsautobuild
     lazr.jobrunner
+    lpjsmin
+    pyinotify
+    zc.zservertracelog
 include-site-packages = true
 allowed-eggs-from-site-packages =
 interpreter = py
@@ -50,38 +47,7 @@
     # See buildout.cfg, [scripts] section, "initialization" key.
     from lp_sitecustomize import main
     main('${configuration:instance_name}') # Initializes LP environment.
-entry-points =
-    googletestservice=lp.services.googlesearch.googletestservice:main
-    tracereport=zc.zservertracelog.tracereport:main
-
-[iharness]
-recipe = z3c.recipe.scripts
-eggs = ${scripts:eggs}
-     ipython
-include-site-packages = true
-allowed-eggs-from-site-packages =
-initialization = ${scripts:initialization}
-entry-points = iharness=lp.scripts.harness:ipython
-scripts = iharness ipython=ipy
 
 [tags]
 recipe = z3c.recipe.tag:tags
 eggs = lp
-
-[txlongpoll]
-recipe = z3c.recipe.scripts
-eggs = ${scripts:eggs}
-    txlongpoll
-include-site-packages = false
-initialization = ${scripts:initialization}
-entry-points = twistd-for-txlongpoll=twisted.scripts.twistd:run
-scripts = twistd-for-txlongpoll
-
-[txpkgupload]
-recipe = z3c.recipe.scripts
-eggs = ${scripts:eggs}
-    txpkgupload
-include-site-packages = false
-initialization = ${scripts:initialization}
-entry-points = twistd-for-txpkgupload=twisted.scripts.twistd:run
-scripts = twistd-for-txpkgupload

=== modified file 'lib/lp/scripts/runlaunchpad.py'
--- lib/lp/scripts/runlaunchpad.py	2016-02-05 16:51:12 +0000
+++ lib/lp/scripts/runlaunchpad.py	2017-09-04 13:17:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -246,8 +246,7 @@
         return config.txlongpoll.launch
 
     def launch(self):
-        twistd_bin = os.path.join(
-            config.root, 'bin', 'twistd-for-txlongpoll')
+        twistd_bin = os.path.join(config.root, 'bin', 'twistd')
         broker_hostname, broker_port = as_host_port(
             config.rabbitmq.host, None, None)
         self.server = TxLongPollServer(

=== modified file 'lib/lp/services/txlongpoll/tests/test_server.py'
--- lib/lp/services/txlongpoll/tests/test_server.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/txlongpoll/tests/test_server.py	2017-09-04 13:17:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2011-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for lp.services.rabbit.TxLongPollServer."""
@@ -22,8 +22,7 @@
     def test_service_config(self):
         # TxLongPollServer pokes some .ini configuration into its
         # service_config attributes.
-        twistd_bin = os.path.join(
-            config.root, 'bin', 'twistd-for-txlongpoll')
+        twistd_bin = os.path.join(config.root, 'bin', 'twistd')
         fixture = self.useFixture(TxLongPollServer(
             broker_user='guest', broker_password='guest', broker_vhost='/',
             broker_port=123, frontend_port=None,

=== modified file 'setup.py'
--- setup.py	2017-05-11 14:33:38 +0000
+++ setup.py	2017-09-04 13:17:45 +0000
@@ -32,30 +32,28 @@
         'backports.lzma',
         'BeautifulSoup',
         'bzr',
+        'celery',
         'cssselect',
         'cssutils',
         'dkimpy',
         # Required for dkimpy
         'dnspython',
-        'fixtures',
         'FeedParser',
         'feedvalidator',
+        'fixtures',
         'html5browser',
         'httmock',
-        'pygpgme',
-        'python-debian',
-        'python-keystoneclient',
-        'python-subunit',
-        'python-swiftclient',
+        'ipython',
+        'jsautobuild',
         'launchpad-buildd',
         'launchpadlib',
         'lazr.batchnavigator',
         'lazr.config',
         'lazr.delegates',
         'lazr.enum',
+        'lazr.jobrunner',
         'lazr.lifecycle',
         'lazr.restful',
-        'lazr.jobrunner',
         'lazr.smtptest',
         'lazr.sshserver',
         'lazr.testing',
@@ -76,10 +74,16 @@
         'pgbouncer',
         'psycopg2',
         'pyasn1',
+        'pygpgme',
+        'pyinotify',
         'pymacaroons',
         'pystache',
+        'python-debian',
+        'python-keystoneclient',
         'python-memcached',
         'python-openid',
+        'python-subunit',
+        'python-swiftclient',
         'pytz',
         'PyYAML',
         'rabbitfixture',
@@ -89,9 +93,9 @@
         'setproctitle',
         'setuptools',
         'six',
-        'Sphinx',
         'soupmatchers',
         'sourcecodegen',
+        'Sphinx',
         'storm',
         'subvertpy',
         'testscenarios',
@@ -100,7 +104,9 @@
         'transaction',
         'Twisted',
         'txfixtures',
+        'txlongpoll',
         'txlongpollfixture',
+        'txpkgupload',
         'wadllib',
         'z3c.pt',
         'z3c.ptcompat',
@@ -113,8 +119,8 @@
         'zope.app.testing',
         'zope.app.wsgi',
         'zope.authentication',
+        'zope.component[zcml]',
         'zope.contenttype',
-        'zope.component[zcml]',
         'zope.datetime',
         'zope.error',
         'zope.event',
@@ -127,8 +133,8 @@
         'zope.login',
         'zope.pagetemplate',
         'zope.principalregistry',
+        'zope.proxy',
         'zope.publisher',
-        'zope.proxy',
         'zope.schema',
         'zope.security',
         'zope.securitypolicy',
@@ -165,7 +171,11 @@
             'apiindex = lp.scripts.utilities.apiindex:main',
             'bzr = lp.scripts.utilities.bzr:main',
             'combine-css = lp.scripts.utilities.js.combinecss:main',
+            'googletestservice = '
+                'lp.services.googlesearch.googletestservice:main',
             'harness = lp.scripts.harness:python',
+            'iharness = lp.scripts.harness:ipython',
+            'ipy = IPython.frontend.terminal.ipapp:launch_new_instance',
             'jsbuild = lp.scripts.utilities.js.jsbuild:main',
             'kill-test-services = lp.scripts.utilities.killtestservices:main',
             'killservice = lp.scripts.utilities.killservice:main',
@@ -175,6 +185,7 @@
             'sprite-util = lp.scripts.utilities.spriteutil:main',
             'start_librarian = lp.scripts.runlaunchpad:start_librarian',
             'test = lp.scripts.utilities.test:main',
+            'tracereport = zc.zservertracelog.tracereport:main',
             'twistd = twisted.scripts.twistd:run',
             'watch_jsbuild = lp.scripts.utilities.js.watchjsbuild:main',
             'with-xvfb = lp.scripts.utilities.withxvfb:main',

=== modified file 'utilities/start-dev-soyuz.sh'
--- utilities/start-dev-soyuz.sh	2015-01-13 16:02:40 +0000
+++ utilities/start-dev-soyuz.sh	2017-09-04 13:17:45 +0000
@@ -20,7 +20,7 @@
     plugin=$2
     shift 2
     echo "Starting $name."
-    "bin/twistd-for-$name" \
+    bin/twistd \
         --logfile "/var/tmp/development-$name.log" \
         --pidfile "/var/tmp/development-$name.pid" \
         "$plugin" "$@"