From 04080d76b1d682b28f89e5d9403759a3782fb8f3 Mon Sep 17 00:00:00 2001 From: Eevee Date: Sat, 15 May 2010 20:28:54 -0700 Subject: [PATCH 1/1] Great Migration: spline.plugins => splinext --- setup.py | 6 +++--- spline/__init__.py | 1 - {spline/plugins => splinext}/__init__.py | 0 {spline/plugins => splinext}/gts/__init__.py | 8 ++++---- {spline/plugins => splinext}/gts/controllers/__init__.py | 0 {spline/plugins => splinext}/gts/controllers/gts.py | 2 +- {spline/plugins => splinext}/gts/model/__init__.py | 0 {spline/plugins => splinext}/gts/templates/css/gts.mako | 0 8 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 spline/__init__.py rename {spline/plugins => splinext}/__init__.py (100%) rename {spline/plugins => splinext}/gts/__init__.py (83%) rename {spline/plugins => splinext}/gts/controllers/__init__.py (100%) rename {spline/plugins => splinext}/gts/controllers/gts.py (99%) rename {spline/plugins => splinext}/gts/model/__init__.py (100%) rename {spline/plugins => splinext}/gts/templates/css/gts.mako (100%) diff --git a/setup.py b/setup.py index 7dd0cfc..2f96d5b 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name = 'spline-gts', version = '0.1', packages = find_packages(), - + install_requires = [ 'spline', 'spline-users', @@ -14,7 +14,7 @@ setup( zip_safe = False, - entry_points = {'spline.plugins': 'gts = spline.plugins.gts:GTSPlugin'}, + entry_points = {'spline.plugins': 'gts = splinext.gts:GTSPlugin'}, - namespace_packages = ['spline', 'spline.plugins'], + namespace_packages = ['splinext'], ) diff --git a/spline/__init__.py b/spline/__init__.py deleted file mode 100644 index de40ea7..0000000 --- a/spline/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/spline/plugins/__init__.py b/splinext/__init__.py similarity index 100% rename from spline/plugins/__init__.py rename to splinext/__init__.py diff --git a/spline/plugins/gts/__init__.py b/splinext/gts/__init__.py similarity index 83% rename from spline/plugins/gts/__init__.py rename to splinext/gts/__init__.py index c1b0fb5..bd10c07 100644 --- a/spline/plugins/gts/__init__.py +++ b/splinext/gts/__init__.py @@ -7,8 +7,8 @@ from spline.lib.plugin import PluginBase, PluginLink, Priority import spline.model as model import spline.model.meta as meta -import spline.plugins.gts.controllers.gts -import spline.plugins.gts.model +import splinext.gts.controllers.gts +import splinext.gts.model def add_routes_hook(map, *args, **kwargs): """Hook to inject some of our behavior into the routes configuration.""" @@ -20,12 +20,12 @@ def add_routes_hook(map, *args, **kwargs): class GTSPlugin(PluginBase): def controllers(self): return dict( - gts = spline.plugins.gts.controllers.gts.GTSController, + gts = splinext.gts.controllers.gts.GTSController, ) def model(self): return [ - spline.plugins.gts.model.GTSPokemon, + splinext.gts.model.GTSPokemon, ] def template_dirs(self): diff --git a/spline/plugins/gts/controllers/__init__.py b/splinext/gts/controllers/__init__.py similarity index 100% rename from spline/plugins/gts/controllers/__init__.py rename to splinext/gts/controllers/__init__.py diff --git a/spline/plugins/gts/controllers/gts.py b/splinext/gts/controllers/gts.py similarity index 99% rename from spline/plugins/gts/controllers/gts.py rename to splinext/gts/controllers/gts.py index 98526a8..a9262f0 100644 --- a/spline/plugins/gts/controllers/gts.py +++ b/splinext/gts/controllers/gts.py @@ -25,7 +25,7 @@ from spline.model import meta from spline.lib.base import BaseController, render from spline.lib import helpers as h -from spline.plugins.gts.model import GTSPokemon +from splinext.gts.model import GTSPokemon log = logging.getLogger(__name__) diff --git a/spline/plugins/gts/model/__init__.py b/splinext/gts/model/__init__.py similarity index 100% rename from spline/plugins/gts/model/__init__.py rename to splinext/gts/model/__init__.py diff --git a/spline/plugins/gts/templates/css/gts.mako b/splinext/gts/templates/css/gts.mako similarity index 100% rename from spline/plugins/gts/templates/css/gts.mako rename to splinext/gts/templates/css/gts.mako -- 2.7.4