Move mediagoblin.celery_setup -> mediagoblin.init.celery

As the first target of the new .init. submodule move
celery_setup there. Quite straight forward, just a lot of
places to change.

diff --git a/docs/hackinghowto.rst b/docs/hackinghowto.rst
index 911f2340b3ad0d2de58cae40792667eb1e9ac4ed..08b228f1e966221a5964f168cd62dbe8b68f176e 100644 (file)
--- a/docs/hackinghowto.rst
+++ b/docs/hackinghowto.rst
@@ -150,7 +150,7 @@ celeryd in another window.
 
 Run::
 
-    CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_celery ./bin/celeryd
+    CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery ./bin/celeryd
 
 
 Running the test suite

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index b27b5761c1482c39cedb1847dfad67958ed1d96d..080c8e3a2039cd8a95100fa7f291b8edd107edac 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -25,7 +25,7 @@ from mediagoblin.config import (
     read_mediagoblin_config, generate_validation_report)
 from mediagoblin.db.open import setup_connection_and_db_from_config
 from mediagoblin.mg_globals import setup_globals
-from mediagoblin.celery_setup import setup_celery_from_config
+from mediagoblin.init.celery import setup_celery_from_config
 from mediagoblin.workbench import WorkbenchManager
 
 

diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/init/celery/__init__.py
similarity index 97%
rename from mediagoblin/celery_setup/__init__.py
rename to mediagoblin/init/celery/__init__.py
index e35dbce2d0d35611996e15b9167fe90b16007fda..67c3dfa059619825b112d5f88446e4389694322e 100644 (file)
--- a/mediagoblin/celery_setup/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -20,7 +20,7 @@ import sys
 
 MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media']
 
-DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module'
+DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module'
 
 
 def setup_celery_from_config(app_config, global_config,

diff --git a/mediagoblin/celery_setup/dummy_settings_module.py b/mediagoblin/init/celery/dummy_settings_module.py
similarity index 100%
rename from mediagoblin/celery_setup/dummy_settings_module.py
rename to mediagoblin/init/celery/dummy_settings_module.py

diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/init/celery/from_celery.py
similarity index 97%
rename from mediagoblin/celery_setup/from_celery.py
rename to mediagoblin/init/celery/from_celery.py
index ed0a409e063aba05912aced3c24a14185d4b920e..c053591be1b08e23fec9e4f93f9835386c9b356c 100644 (file)
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/init/celery/from_celery.py
@@ -17,7 +17,7 @@
 import os
 
 from mediagoblin import app, mg_globals
-from mediagoblin.celery_setup import setup_celery_from_config
+from mediagoblin.init.celery import setup_celery_from_config
 
 
 OUR_MODULENAME = __name__

diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/init/celery/from_tests.py
similarity index 95%
rename from mediagoblin/celery_setup/from_tests.py
rename to mediagoblin/init/celery/from_tests.py
index 779ecd652472126c1ccd7d1679e39c63dfaa98dd..b2293e2c06f4dd0ec2cbe47dc8f0664592c42874 100644 (file)
--- a/mediagoblin/celery_setup/from_tests.py
+++ b/mediagoblin/init/celery/from_tests.py
@@ -17,7 +17,7 @@
 import os
 
 from mediagoblin.tests.tools import TEST_APP_CONFIG
-from mediagoblin.celery_setup.from_celery import setup_self
+from mediagoblin.init.celery.from_celery import setup_self
 
 
 OUR_MODULENAME = __name__

diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index 8bf97ae4b68d18099e6a32121e98695fad351476..d9222620453a286d6228a372c58d835210cedb6b 100644 (file)
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -16,7 +16,7 @@
 
 import pkg_resources
 
-from mediagoblin import celery_setup
+from mediagoblin.init import celery as celery_setup
 from mediagoblin.config import read_mediagoblin_config
 
 

diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index e022d47b490f22646e67e1e15da0e0c76f575051..fd0f87a45eb54c4dfbab252aacb512299db2d70b 100644 (file)
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -8,7 +8,7 @@ email_debug_mode = true
 db_name = __mediagoblin_tests__
 
 # Celery shouldn't be set up by the application as it's setup via
-# mediagoblin.celery_setup.from_celery
+# mediagoblin.init.celery.from_celery
 celery_setup_elsewhere = true
 
 [celery]

diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 64f773f006cd0abe639d449378d5eee290dc9fdf..966515d26eb1c5243e869a811b2f6dc86dc8035d 100644 (file)
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -42,8 +42,8 @@ USER_DEV_DIRECTORIES_TO_SETUP = [
 
 BAD_CELERY_MESSAGE = """\
 Sorry, you *absolutely* must run nosetests with the
-mediagoblin.celery_setup.from_tests module.  Like so:
-$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests"""
+mediagoblin.init.celery.from_tests module.  Like so:
+$ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/nosetests"""
 
 
 class BadCeleryEnviron(Exception): pass
@@ -51,7 +51,7 @@ class BadCeleryEnviron(Exception): pass
 
 def suicide_if_bad_celery_environ():
     if not os.environ.get('CELERY_CONFIG_MODULE') == \
-            'mediagoblin.celery_setup.from_tests':
+            'mediagoblin.init.celery.from_tests':
         raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
     
 
@@ -59,7 +59,7 @@ def get_test_app(dump_old_app=True):
     suicide_if_bad_celery_environ()
 
     # Leave this imported as it sets up celery.
-    from mediagoblin.celery_setup import from_tests
+    from mediagoblin.init.celery import from_tests
 
     global MGOBLIN_APP
 

diff --git a/runtests.sh b/runtests.sh
index 9b96b17cc6471b0d5bba7b3dfe3262fdfeaabbf0..1dfbf09391e35d5ff606d9da589d6067c3a0cf0b 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -27,4 +27,4 @@ else
     exit 1
 fi
 
-CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests $NOSETESTS $@
+CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests $NOSETESTS $@