Move scripts into their own isolated package.

MANIFEST.in

@@ -1,4 +1,5 @@
 recursive-include dallinger *
+recursive-include dallinger_scripts *
 recursive-include docs *
 
 include requirements.txt

dallinger/heroku/clock.py

@@ -50,7 +50,3 @@ def launch():
     if not config.ready:
         config.load()
     scheduler.start()
-
-
-if __name__ == '__main__':
-    launch()

dallinger/heroku/worker.py

@@ -1,46 +1,9 @@
-"""Heroku web worker."""
-# Make sure gevent patches are applied early.
-import os
-
-listen = ['high', 'default', 'low']
-
-
-def main():
-    import gevent.monkey
-    gevent.monkey.patch_all()
-
-    # These imports are inside the __main__ block
-    # to make sure that we only import from rq_gevent_worker
-    # (which has the side effect of applying gevent monkey patches)
-    # in the worker process. This way other processes can import the
-    # redis connection without that side effect.
-    from rq import (
-        Queue,
-        Connection
-    )
-    from dallinger.db import redis_conn
-    from dallinger.heroku.rq_gevent_worker import GeventWorker as Worker
-
-    from dallinger.config import initialize_experiment_package
-    initialize_experiment_package(os.getcwd())
-
-    import logging
-    logging.basicConfig(format='%(asctime)s %(message)s', level=logging.DEBUG)
-
-    with Connection(redis_conn):
-        worker = Worker(list(map(Queue, listen)))
-        worker.work()
-
-
-if __name__ == '__main__':  # pragma: nocover
-    main()
-else:
-    import warnings
-    warnings.warn(
-        u"Importing from heroku.worker is deprecated and may cause errors."
-        u"The redis `conn` should be imported from `dallinger.db.redis_conn`",
-        DeprecationWarning
-    )
-    from dallinger.db import redis_conn
-
-    conn = redis_conn
+import warnings
+from dallinger.db import redis_conn
+warnings.warn(
+    u"Importing from heroku.worker is deprecated and may cause errors."
+    u"The redis `conn` should be imported from `dallinger.db.redis_conn`",
+    DeprecationWarning
+)
+
+conn = redis_conn

dallinger_scripts/clock.py

@@ -0,0 +1,7 @@
+def main():
+    from dallinger.heroku.clock import launch
+    launch()
+
+
+if __name__ == '__main__':
+    main()

dallinger_scripts/worker.py

@@ -0,0 +1,36 @@
+"""Heroku web worker."""
+# Make sure gevent patches are applied early.
+import os
+
+listen = ['high', 'default', 'low']
+
+
+def main():
+    import gevent.monkey
+    gevent.monkey.patch_all()
+
+    # These imports are inside the __main__ block
+    # to make sure that we only import from rq_gevent_worker
+    # (which has the side effect of applying gevent monkey patches)
+    # in the worker process. This way other processes can import the
+    # redis connection without that side effect.
+    from rq import (
+        Queue,
+        Connection
+    )
+    from dallinger.db import redis_conn
+    from dallinger.heroku.rq_gevent_worker import GeventWorker as Worker
+
+    from dallinger.config import initialize_experiment_package
+    initialize_experiment_package(os.getcwd())
+
+    import logging
+    logging.basicConfig(format='%(asctime)s %(message)s', level=logging.DEBUG)
+
+    with Connection(redis_conn):
+        worker = Worker(list(map(Queue, listen)))
+        worker.work()
+
+
+if __name__ == '__main__':  # pragma: nocover
+    main()

setup.py

@@ -5,7 +5,7 @@
 
 setup_args = dict(
     name='dallinger',
-    packages=['dallinger'],
+    packages=['dallinger', 'dallinger_scripts'],
     version="4.0.0",
     description='Laboratory automation for the behavioral and social sciences',
     url='http://github.com/Dallinger/Dallinger',
@@ -27,9 +27,9 @@
     entry_points={
         'console_scripts': [
             'dallinger = dallinger.command_line:dallinger',
-            'dallinger_heroku_web = dallinger.heroku.launch:main',
-            'dallinger_heroku_worker = dallinger.heroku.worker:main',
-            'dallinger_heroku_clock = dallinger.heroku.clock:launch',
+            'dallinger_heroku_web = dallinger_scripts.web:main',
+            'dallinger_heroku_worker = dallinger_scripts.worker:main',
+            'dallinger_heroku_clock = dallinger_scripts.clock:main',
         ],
         'dallinger.experiments': [],
     },