diff --git a/.gitignore b/.gitignore index b9f93bc3..e63adb45 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -rattail.pyramid.egg-info +Tailbone.egg-info diff --git a/MANIFEST.in b/MANIFEST.in index 01e7eaae..a4a5832b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,8 +3,8 @@ include *.txt include *.rst include *.py -recursive-include rattail/pyramid/static *.css -recursive-include rattail/pyramid/static *.png +recursive-include tailbone/static *.css +recursive-include tailbone/static *.png -recursive-include rattail/pyramid/templates *.mako -recursive-include rattail/pyramid/reports *.mako +recursive-include tailbone/templates *.mako +recursive-include tailbone/reports *.mako diff --git a/README.txt b/README.txt index c71ce1e0..3f47d5c7 100644 --- a/README.txt +++ b/README.txt @@ -1,11 +1,9 @@ -rattail.pyramid -=============== +Tailbone +======== -Rattail is a retail software framework based on `edbob `_, -and released under the GNU Affero General Public License. - -This package contains Pyramid views, etc., for managing a Rattail system. +Tailbone is an extensible web application based on Rattail. It provides a +"back-office network environment" (BONE) for use in managing retail data. Please see Rattail's `home page `_ for more information. diff --git a/fabfile.py b/fabfile.py index 59fc3925..15a5b690 100644 --- a/fabfile.py +++ b/fabfile.py @@ -22,27 +22,15 @@ # ################################################################################ -import os.path import shutil - -from fabric.api import * - - -execfile(os.path.join(os.path.dirname(__file__), 'rattail', 'pyramid', '_version.py')) +from fabric.api import local @task def release(): """ - Release a new version of 'rattail.pyramid'. + Release a new version of 'Tailbone'. """ - shutil.rmtree('rattail.pyramid.egg-info') + shutil.rmtree('Tailbone.egg-info') local('python setup.py sdist --formats=gztar register upload') - - filename = 'rattail.pyramid-{0}.tar.gz'.format(__version__) - - put(os.path.join('dist', filename), '/srv/pypi/{0}'.format(filename)) - with cd('/srv/pypi'): - run('rm --recursive --force simple') - run('compoze index') diff --git a/rattail/__init__.py b/rattail/__init__.py deleted file mode 100644 index de40ea7c..00000000 --- a/rattail/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/rattail/pyramid/views/__init__.py b/rattail/pyramid/views/__init__.py deleted file mode 100644 index 1ec6624c..00000000 --- a/rattail/pyramid/views/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2012 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU Affero General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for -# more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Rattail. If not, see . -# -################################################################################ - -""" -``rattail.pyramid.views`` -- Pyramid Views -""" - -from rattail.pyramid.views.core import * -from rattail.pyramid.views.grids import * -from rattail.pyramid.views.crud import * -from rattail.pyramid.views.autocomplete import * - - -def includeme(config): - config.include('rattail.pyramid.views.batches') - # config.include('rattail.pyramid.views.categories') - config.include('rattail.pyramid.views.customergroups') - config.include('rattail.pyramid.views.customers') - config.include('rattail.pyramid.views.departments') - config.include('rattail.pyramid.views.employees') - config.include('rattail.pyramid.views.labels') - config.include('rattail.pyramid.views.products') - config.include('rattail.pyramid.views.roles') - config.include('rattail.pyramid.views.stores') - config.include('rattail.pyramid.views.subdepartments') - config.include('rattail.pyramid.views.vendors') diff --git a/setup.cfg b/setup.cfg index f1fb856f..5ec1ac59 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [nosetests] nocapture = 1 -cover-package = rattail.pyramid +cover-package = tailbone cover-erase = 1 cover-inclusive = 1 cover-html = 1 diff --git a/setup.py b/setup.py index b9a207db..20b5f5e1 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ from setuptools import setup, find_packages here = os.path.abspath(os.path.dirname(__file__)) -execfile(os.path.join(here, 'rattail', 'pyramid', '_version.py')) +execfile(os.path.join(here, 'tailbone', '_version.py')) README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.rst')).read() @@ -68,13 +68,13 @@ requires = [ setup( - name = "rattail.pyramid", + name = "Tailbone", version = __version__, author = "Lance Edgar", author_email = "lance@edbob.org", url = "http://rattail.edbob.org/", license = "GNU Affero GPL v3", - description = "Rattail Pyramid Framework", + description = "Backoffice Web Application for Rattail", long_description = README + '\n\n' + CHANGES, classifiers = [ @@ -97,7 +97,6 @@ setup( tests_require = requires + ['mock', 'nose', 'coverage', 'fixture'], test_suite = 'nose.collector', - namespace_packages = ['rattail'], packages = find_packages(), include_package_data = True, zip_safe = False, diff --git a/rattail/pyramid/__init__.py b/tailbone/__init__.py similarity index 81% rename from rattail/pyramid/__init__.py rename to tailbone/__init__.py index 2eb735f7..97b40f6f 100644 --- a/rattail/pyramid/__init__.py +++ b/tailbone/__init__.py @@ -23,15 +23,15 @@ ################################################################################ """ -``rattail.pyramid`` -- Rattail's Pyramid Framework +Rattail's Pyramid Framework """ -from rattail.pyramid._version import __version__ +from ._version import __version__ from edbob.pyramid import Session def includeme(config): - config.include('rattail.pyramid.static') - config.include('rattail.pyramid.subscribers') - config.include('rattail.pyramid.views') + config.include('tailbone.static') + config.include('tailbone.subscribers') + config.include('tailbone.views') diff --git a/rattail/pyramid/_version.py b/tailbone/_version.py similarity index 100% rename from rattail/pyramid/_version.py rename to tailbone/_version.py diff --git a/rattail/pyramid/views/grids/__init__.py b/tailbone/forms/__init__.py similarity index 87% rename from rattail/pyramid/views/grids/__init__.py rename to tailbone/forms/__init__.py index a6f513fa..692e5c05 100644 --- a/rattail/pyramid/views/grids/__init__.py +++ b/tailbone/forms/__init__.py @@ -23,8 +23,9 @@ ################################################################################ """ -``rattail.pyramid.views.grids`` -- Grid Views +Forms """ -from rattail.pyramid.views.grids.core import * -from rattail.pyramid.views.grids.alchemy import * +from .simpleform import * +from .fields import * +from .renderers import * diff --git a/rattail/pyramid/forms/fields.py b/tailbone/forms/fields.py similarity index 96% rename from rattail/pyramid/forms/fields.py rename to tailbone/forms/fields.py index 0ea31b1c..80fe001f 100644 --- a/rattail/pyramid/forms/fields.py +++ b/tailbone/forms/fields.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.fields`` -- FormAlchemy Fields +``tailbone.forms.fields`` -- FormAlchemy Fields """ from formalchemy import Field diff --git a/rattail/pyramid/forms/renderers/__init__.py b/tailbone/forms/renderers/__init__.py similarity index 98% rename from rattail/pyramid/forms/renderers/__init__.py rename to tailbone/forms/renderers/__init__.py index a8ebf910..eabfec98 100644 --- a/rattail/pyramid/forms/renderers/__init__.py +++ b/tailbone/forms/renderers/__init__.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.renderers`` -- FormAlchemy Field Renderers +FormAlchemy Field Renderers """ from webhelpers.html import literal diff --git a/rattail/pyramid/forms/renderers/common.py b/tailbone/forms/renderers/common.py similarity index 97% rename from rattail/pyramid/forms/renderers/common.py rename to tailbone/forms/renderers/common.py index b7f7c092..3ec58917 100644 --- a/rattail/pyramid/forms/renderers/common.py +++ b/tailbone/forms/renderers/common.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.renderers.common`` -- Common Field Renderers +Common Field Renderers """ from formalchemy.fields import FieldRenderer, SelectFieldRenderer diff --git a/rattail/pyramid/forms/renderers/products.py b/tailbone/forms/renderers/products.py similarity index 95% rename from rattail/pyramid/forms/renderers/products.py rename to tailbone/forms/renderers/products.py index 15287e18..beb5ac44 100644 --- a/rattail/pyramid/forms/renderers/products.py +++ b/tailbone/forms/renderers/products.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.renderers.products`` -- Product Field Renderers +Product Field Renderers """ from formalchemy import TextFieldRenderer diff --git a/rattail/pyramid/forms/renderers/users.py b/tailbone/forms/renderers/users.py similarity index 95% rename from rattail/pyramid/forms/renderers/users.py rename to tailbone/forms/renderers/users.py index da4603e9..253cb576 100644 --- a/rattail/pyramid/forms/renderers/users.py +++ b/tailbone/forms/renderers/users.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.renderers.users`` -- User Field Renderers +User Field Renderers """ from formalchemy.fields import TextFieldRenderer diff --git a/rattail/pyramid/forms/simpleform.py b/tailbone/forms/simpleform.py similarity index 96% rename from rattail/pyramid/forms/simpleform.py rename to tailbone/forms/simpleform.py index ab186952..de482bd5 100644 --- a/rattail/pyramid/forms/simpleform.py +++ b/tailbone/forms/simpleform.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.forms.simpleform`` -- ``pyramid_simpleform`` Forms +``pyramid_simpleform`` Forms """ from pyramid_simpleform import renderers diff --git a/rattail/pyramid/forms/__init__.py b/tailbone/grids/__init__.py similarity index 85% rename from rattail/pyramid/forms/__init__.py rename to tailbone/grids/__init__.py index 1f708943..dc9032b8 100644 --- a/rattail/pyramid/forms/__init__.py +++ b/tailbone/grids/__init__.py @@ -23,9 +23,10 @@ ################################################################################ """ -``rattail.pyramid.forms`` -- Forms +Grids """ -from rattail.pyramid.forms.simpleform import * -from rattail.pyramid.forms.fields import * -from rattail.pyramid.forms.renderers import * +from .core import * +from .alchemy import * +from . import util +from . import search diff --git a/rattail/pyramid/grids/alchemy.py b/tailbone/grids/alchemy.py similarity index 96% rename from rattail/pyramid/grids/alchemy.py rename to tailbone/grids/alchemy.py index e6bd78c1..85ddb5d2 100644 --- a/rattail/pyramid/grids/alchemy.py +++ b/tailbone/grids/alchemy.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.grids.alchemy`` -- FormAlchemy Grid Classes +FormAlchemy Grid Classes """ from webhelpers.html import tags @@ -34,8 +34,8 @@ import formalchemy import edbob from edbob.util import prettify -from rattail.pyramid.grids.core import Grid -from rattail.pyramid import Session +from .core import Grid +from .. import Session from sqlalchemy.orm import object_session __all__ = ['AlchemyGrid'] diff --git a/rattail/pyramid/grids/core.py b/tailbone/grids/core.py similarity index 98% rename from rattail/pyramid/grids/core.py rename to tailbone/grids/core.py index c6e2787a..f5541525 100644 --- a/rattail/pyramid/grids/core.py +++ b/tailbone/grids/core.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.grids.core`` -- Core Grid Classes +Core Grid Classes """ try: diff --git a/rattail/pyramid/grids/search.py b/tailbone/grids/search.py similarity index 99% rename from rattail/pyramid/grids/search.py rename to tailbone/grids/search.py index 359096f5..a2dda061 100644 --- a/rattail/pyramid/grids/search.py +++ b/tailbone/grids/search.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.grids.search`` -- Grid Search Filters +Grid Search Filters """ from sqlalchemy import or_ diff --git a/rattail/pyramid/grids/util.py b/tailbone/grids/util.py similarity index 96% rename from rattail/pyramid/grids/util.py rename to tailbone/grids/util.py index df741c19..6ecfd3f8 100644 --- a/rattail/pyramid/grids/util.py +++ b/tailbone/grids/util.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.grids.util`` -- Grid Utilities +Grid Utilities """ from sqlalchemy.orm.attributes import InstrumentedAttribute @@ -32,7 +32,7 @@ from webhelpers.html import literal from pyramid.response import Response -from rattail.pyramid.grids.search import SearchFormRenderer +from .search import SearchFormRenderer def get_sort_config(name, request, **kwargs): @@ -93,7 +93,7 @@ def get_sort_map(cls, names=None, **kwargs): def render_grid(grid, search_form=None, **kwargs): """ Convenience function to render ``grid`` (which should be a - :class:`rattail.pyramid.grids.Grid` instance). + :class:`tailbone.grids.Grid` instance). This "usually" will return a dictionary to be used as context for rendering the final view template. diff --git a/rattail/pyramid/helpers.py b/tailbone/helpers.py similarity index 95% rename from rattail/pyramid/helpers.py rename to tailbone/helpers.py index b3ae834a..8cbfb742 100644 --- a/rattail/pyramid/helpers.py +++ b/tailbone/helpers.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.helpers`` -- Template Context Helpers +Template Context Helpers """ import datetime diff --git a/rattail/pyramid/reports/inventory_worksheet.mako b/tailbone/reports/inventory_worksheet.mako similarity index 100% rename from rattail/pyramid/reports/inventory_worksheet.mako rename to tailbone/reports/inventory_worksheet.mako diff --git a/rattail/pyramid/reports/ordering_worksheet.mako b/tailbone/reports/ordering_worksheet.mako similarity index 100% rename from rattail/pyramid/reports/ordering_worksheet.mako rename to tailbone/reports/ordering_worksheet.mako diff --git a/rattail/pyramid/static/__init__.py b/tailbone/static/__init__.py similarity index 90% rename from rattail/pyramid/static/__init__.py rename to tailbone/static/__init__.py index 13d8fe01..c4fa9dab 100644 --- a/rattail/pyramid/static/__init__.py +++ b/tailbone/static/__init__.py @@ -23,9 +23,9 @@ ################################################################################ """ -``rattail.pyramid.static`` -- Static Assets +Static Assets """ def includeme(config): - config.add_static_view('rattail', 'rattail.pyramid:static') + config.add_static_view('tailbone', 'tailbone:static') diff --git a/rattail/pyramid/static/css/grids.css b/tailbone/static/css/grids.css similarity index 100% rename from rattail/pyramid/static/css/grids.css rename to tailbone/static/css/grids.css diff --git a/rattail/pyramid/static/img/delete.png b/tailbone/static/img/delete.png similarity index 100% rename from rattail/pyramid/static/img/delete.png rename to tailbone/static/img/delete.png diff --git a/rattail/pyramid/static/img/edit.png b/tailbone/static/img/edit.png similarity index 100% rename from rattail/pyramid/static/img/edit.png rename to tailbone/static/img/edit.png diff --git a/rattail/pyramid/static/img/sort_arrow_down.png b/tailbone/static/img/sort_arrow_down.png similarity index 100% rename from rattail/pyramid/static/img/sort_arrow_down.png rename to tailbone/static/img/sort_arrow_down.png diff --git a/rattail/pyramid/static/img/sort_arrow_up.png b/tailbone/static/img/sort_arrow_up.png similarity index 100% rename from rattail/pyramid/static/img/sort_arrow_up.png rename to tailbone/static/img/sort_arrow_up.png diff --git a/rattail/pyramid/static/img/view.png b/tailbone/static/img/view.png similarity index 100% rename from rattail/pyramid/static/img/view.png rename to tailbone/static/img/view.png diff --git a/rattail/pyramid/subscribers.py b/tailbone/subscribers.py similarity index 90% rename from rattail/pyramid/subscribers.py rename to tailbone/subscribers.py index dacd37f9..b832bcec 100644 --- a/rattail/pyramid/subscribers.py +++ b/tailbone/subscribers.py @@ -23,13 +23,13 @@ ################################################################################ """ -``rattail.pyramid.subscribers`` -- Event Subscribers +Event Subscribers """ from pyramid import threadlocal import rattail -from rattail.pyramid import helpers +from . import helpers def before_render(event): @@ -53,5 +53,5 @@ def before_render(event): def includeme(config): - config.add_subscriber('rattail.pyramid.subscribers:before_render', + config.add_subscriber('tailbone.subscribers:before_render', 'pyramid.events.BeforeRender') diff --git a/rattail/pyramid/templates/autocomplete.mako b/tailbone/templates/autocomplete.mako similarity index 100% rename from rattail/pyramid/templates/autocomplete.mako rename to tailbone/templates/autocomplete.mako diff --git a/rattail/pyramid/templates/batches/crud.mako b/tailbone/templates/batches/crud.mako similarity index 100% rename from rattail/pyramid/templates/batches/crud.mako rename to tailbone/templates/batches/crud.mako diff --git a/rattail/pyramid/templates/batches/index.mako b/tailbone/templates/batches/index.mako similarity index 100% rename from rattail/pyramid/templates/batches/index.mako rename to tailbone/templates/batches/index.mako diff --git a/rattail/pyramid/templates/batches/params.mako b/tailbone/templates/batches/params.mako similarity index 100% rename from rattail/pyramid/templates/batches/params.mako rename to tailbone/templates/batches/params.mako diff --git a/rattail/pyramid/templates/batches/params/print_labels.mako b/tailbone/templates/batches/params/print_labels.mako similarity index 100% rename from rattail/pyramid/templates/batches/params/print_labels.mako rename to tailbone/templates/batches/params/print_labels.mako diff --git a/rattail/pyramid/templates/batches/read.mako b/tailbone/templates/batches/read.mako similarity index 100% rename from rattail/pyramid/templates/batches/read.mako rename to tailbone/templates/batches/read.mako diff --git a/rattail/pyramid/templates/batches/rows/crud.mako b/tailbone/templates/batches/rows/crud.mako similarity index 100% rename from rattail/pyramid/templates/batches/rows/crud.mako rename to tailbone/templates/batches/rows/crud.mako diff --git a/rattail/pyramid/templates/batches/rows/index.mako b/tailbone/templates/batches/rows/index.mako similarity index 100% rename from rattail/pyramid/templates/batches/rows/index.mako rename to tailbone/templates/batches/rows/index.mako diff --git a/rattail/pyramid/templates/brands/crud.mako b/tailbone/templates/brands/crud.mako similarity index 100% rename from rattail/pyramid/templates/brands/crud.mako rename to tailbone/templates/brands/crud.mako diff --git a/rattail/pyramid/templates/brands/index.mako b/tailbone/templates/brands/index.mako similarity index 100% rename from rattail/pyramid/templates/brands/index.mako rename to tailbone/templates/brands/index.mako diff --git a/rattail/pyramid/templates/categories/crud.mako b/tailbone/templates/categories/crud.mako similarity index 100% rename from rattail/pyramid/templates/categories/crud.mako rename to tailbone/templates/categories/crud.mako diff --git a/rattail/pyramid/templates/categories/index.mako b/tailbone/templates/categories/index.mako similarity index 100% rename from rattail/pyramid/templates/categories/index.mako rename to tailbone/templates/categories/index.mako diff --git a/rattail/pyramid/templates/crud.mako b/tailbone/templates/crud.mako similarity index 100% rename from rattail/pyramid/templates/crud.mako rename to tailbone/templates/crud.mako diff --git a/rattail/pyramid/templates/customergroups/crud.mako b/tailbone/templates/customergroups/crud.mako similarity index 100% rename from rattail/pyramid/templates/customergroups/crud.mako rename to tailbone/templates/customergroups/crud.mako diff --git a/rattail/pyramid/templates/customergroups/index.mako b/tailbone/templates/customergroups/index.mako similarity index 100% rename from rattail/pyramid/templates/customergroups/index.mako rename to tailbone/templates/customergroups/index.mako diff --git a/rattail/pyramid/templates/customers/crud.mako b/tailbone/templates/customers/crud.mako similarity index 100% rename from rattail/pyramid/templates/customers/crud.mako rename to tailbone/templates/customers/crud.mako diff --git a/rattail/pyramid/templates/customers/index.mako b/tailbone/templates/customers/index.mako similarity index 100% rename from rattail/pyramid/templates/customers/index.mako rename to tailbone/templates/customers/index.mako diff --git a/rattail/pyramid/templates/customers/read.mako b/tailbone/templates/customers/read.mako similarity index 100% rename from rattail/pyramid/templates/customers/read.mako rename to tailbone/templates/customers/read.mako diff --git a/rattail/pyramid/templates/departments/crud.mako b/tailbone/templates/departments/crud.mako similarity index 100% rename from rattail/pyramid/templates/departments/crud.mako rename to tailbone/templates/departments/crud.mako diff --git a/rattail/pyramid/templates/departments/index.mako b/tailbone/templates/departments/index.mako similarity index 100% rename from rattail/pyramid/templates/departments/index.mako rename to tailbone/templates/departments/index.mako diff --git a/rattail/pyramid/templates/employees/crud.mako b/tailbone/templates/employees/crud.mako similarity index 100% rename from rattail/pyramid/templates/employees/crud.mako rename to tailbone/templates/employees/crud.mako diff --git a/rattail/pyramid/templates/employees/index.mako b/tailbone/templates/employees/index.mako similarity index 100% rename from rattail/pyramid/templates/employees/index.mako rename to tailbone/templates/employees/index.mako diff --git a/rattail/pyramid/templates/forms/field_autocomplete.mako b/tailbone/templates/forms/field_autocomplete.mako similarity index 100% rename from rattail/pyramid/templates/forms/field_autocomplete.mako rename to tailbone/templates/forms/field_autocomplete.mako diff --git a/rattail/pyramid/templates/grids/grid.mako b/tailbone/templates/grids/grid.mako similarity index 100% rename from rattail/pyramid/templates/grids/grid.mako rename to tailbone/templates/grids/grid.mako diff --git a/rattail/pyramid/templates/labels/profiles/crud.mako b/tailbone/templates/labels/profiles/crud.mako similarity index 100% rename from rattail/pyramid/templates/labels/profiles/crud.mako rename to tailbone/templates/labels/profiles/crud.mako diff --git a/rattail/pyramid/templates/labels/profiles/index.mako b/tailbone/templates/labels/profiles/index.mako similarity index 100% rename from rattail/pyramid/templates/labels/profiles/index.mako rename to tailbone/templates/labels/profiles/index.mako diff --git a/rattail/pyramid/templates/labels/profiles/printer.mako b/tailbone/templates/labels/profiles/printer.mako similarity index 100% rename from rattail/pyramid/templates/labels/profiles/printer.mako rename to tailbone/templates/labels/profiles/printer.mako diff --git a/rattail/pyramid/templates/labels/profiles/read.mako b/tailbone/templates/labels/profiles/read.mako similarity index 100% rename from rattail/pyramid/templates/labels/profiles/read.mako rename to tailbone/templates/labels/profiles/read.mako diff --git a/rattail/pyramid/templates/people/crud.mako b/tailbone/templates/people/crud.mako similarity index 100% rename from rattail/pyramid/templates/people/crud.mako rename to tailbone/templates/people/crud.mako diff --git a/rattail/pyramid/templates/products/batch.mako b/tailbone/templates/products/batch.mako similarity index 100% rename from rattail/pyramid/templates/products/batch.mako rename to tailbone/templates/products/batch.mako diff --git a/rattail/pyramid/templates/products/crud.mako b/tailbone/templates/products/crud.mako similarity index 100% rename from rattail/pyramid/templates/products/crud.mako rename to tailbone/templates/products/crud.mako diff --git a/rattail/pyramid/templates/products/index.mako b/tailbone/templates/products/index.mako similarity index 100% rename from rattail/pyramid/templates/products/index.mako rename to tailbone/templates/products/index.mako diff --git a/rattail/pyramid/templates/products/read.mako b/tailbone/templates/products/read.mako similarity index 100% rename from rattail/pyramid/templates/products/read.mako rename to tailbone/templates/products/read.mako diff --git a/rattail/pyramid/templates/reports/base.mako b/tailbone/templates/reports/base.mako similarity index 100% rename from rattail/pyramid/templates/reports/base.mako rename to tailbone/templates/reports/base.mako diff --git a/rattail/pyramid/templates/reports/inventory.mako b/tailbone/templates/reports/inventory.mako similarity index 100% rename from rattail/pyramid/templates/reports/inventory.mako rename to tailbone/templates/reports/inventory.mako diff --git a/rattail/pyramid/templates/reports/ordering.mako b/tailbone/templates/reports/ordering.mako similarity index 100% rename from rattail/pyramid/templates/reports/ordering.mako rename to tailbone/templates/reports/ordering.mako diff --git a/rattail/pyramid/templates/stores/crud.mako b/tailbone/templates/stores/crud.mako similarity index 100% rename from rattail/pyramid/templates/stores/crud.mako rename to tailbone/templates/stores/crud.mako diff --git a/rattail/pyramid/templates/stores/index.mako b/tailbone/templates/stores/index.mako similarity index 100% rename from rattail/pyramid/templates/stores/index.mako rename to tailbone/templates/stores/index.mako diff --git a/rattail/pyramid/templates/subdepartments/crud.mako b/tailbone/templates/subdepartments/crud.mako similarity index 100% rename from rattail/pyramid/templates/subdepartments/crud.mako rename to tailbone/templates/subdepartments/crud.mako diff --git a/rattail/pyramid/templates/subdepartments/index.mako b/tailbone/templates/subdepartments/index.mako similarity index 100% rename from rattail/pyramid/templates/subdepartments/index.mako rename to tailbone/templates/subdepartments/index.mako diff --git a/rattail/pyramid/templates/users/crud.mako b/tailbone/templates/users/crud.mako similarity index 100% rename from rattail/pyramid/templates/users/crud.mako rename to tailbone/templates/users/crud.mako diff --git a/rattail/pyramid/templates/vendors/crud.mako b/tailbone/templates/vendors/crud.mako similarity index 100% rename from rattail/pyramid/templates/vendors/crud.mako rename to tailbone/templates/vendors/crud.mako diff --git a/rattail/pyramid/templates/vendors/index.mako b/tailbone/templates/vendors/index.mako similarity index 100% rename from rattail/pyramid/templates/vendors/index.mako rename to tailbone/templates/vendors/index.mako diff --git a/rattail/pyramid/views/batches/__init__.py b/tailbone/views/__init__.py similarity index 60% rename from rattail/pyramid/views/batches/__init__.py rename to tailbone/views/__init__.py index 884fe329..f180b7fa 100644 --- a/rattail/pyramid/views/batches/__init__.py +++ b/tailbone/views/__init__.py @@ -23,13 +23,25 @@ ################################################################################ """ -``rattail.pyramid.views.batches`` -- Batch Views +Pyramid Views """ -from rattail.pyramid.views.batches.params import * +from .core import * +from .grids import * +from .crud import * +from .autocomplete import * def includeme(config): - config.include('rattail.pyramid.views.batches.core') - config.include('rattail.pyramid.views.batches.params') - config.include('rattail.pyramid.views.batches.rows') + config.include('tailbone.views.batches') + # config.include('tailbone.views.categories') + config.include('tailbone.views.customergroups') + config.include('tailbone.views.customers') + config.include('tailbone.views.departments') + config.include('tailbone.views.employees') + config.include('tailbone.views.labels') + config.include('tailbone.views.products') + config.include('tailbone.views.roles') + config.include('tailbone.views.stores') + config.include('tailbone.views.subdepartments') + config.include('tailbone.views.vendors') diff --git a/rattail/pyramid/views/autocomplete.py b/tailbone/views/autocomplete.py similarity index 93% rename from rattail/pyramid/views/autocomplete.py rename to tailbone/views/autocomplete.py index bcfd9217..a64cea49 100644 --- a/rattail/pyramid/views/autocomplete.py +++ b/tailbone/views/autocomplete.py @@ -23,11 +23,11 @@ ################################################################################ """ -``rattail.pyramid.views.autocomplete`` -- Autocomplete View +Autocomplete View """ -from rattail.pyramid.views import View -from rattail.pyramid import Session +from .core import View +from .. import Session __all__ = ['AutocompleteView'] diff --git a/rattail/pyramid/grids/__init__.py b/tailbone/views/batches/__init__.py similarity index 82% rename from rattail/pyramid/grids/__init__.py rename to tailbone/views/batches/__init__.py index 9c936f2b..0c6065cd 100644 --- a/rattail/pyramid/grids/__init__.py +++ b/tailbone/views/batches/__init__.py @@ -23,10 +23,13 @@ ################################################################################ """ -``rattail.pyramid.grids`` -- Grids +Batch Views """ -from rattail.pyramid.grids.core import * -from rattail.pyramid.grids.alchemy import * -from rattail.pyramid.grids import util -from rattail.pyramid.grids import search +from .params import * + + +def includeme(config): + config.include('tailbone.views.batches.core') + config.include('tailbone.views.batches.params') + config.include('tailbone.views.batches.rows') diff --git a/rattail/pyramid/views/batches/core.py b/tailbone/views/batches/core.py similarity index 95% rename from rattail/pyramid/views/batches/core.py rename to tailbone/views/batches/core.py index 11ac551f..f5ede3c8 100644 --- a/rattail/pyramid/views/batches/core.py +++ b/tailbone/views/batches/core.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.views.batches.core`` -- Core Batch Views +Core Batch Views """ from pyramid.httpexceptions import HTTPFound @@ -32,14 +32,14 @@ from pyramid.renderers import render_to_response from webhelpers.html import tags from edbob.pyramid.forms import PrettyDateTimeFieldRenderer -from rattail.pyramid.forms import EnumFieldRenderer -from rattail.pyramid.grids.search import BooleanSearchFilter +from ...forms import EnumFieldRenderer +from ...grids.search import BooleanSearchFilter from edbob.pyramid.progress import SessionProgress -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView, View +from .. import SearchableAlchemyGridView, CrudView, View import rattail from rattail import batches -from rattail.pyramid import Session +from ... import Session from rattail.db.model import Batch from rattail.threads import Thread diff --git a/rattail/pyramid/views/batches/params/__init__.py b/tailbone/views/batches/params/__init__.py similarity index 89% rename from rattail/pyramid/views/batches/params/__init__.py rename to tailbone/views/batches/params/__init__.py index af145b8f..07a17939 100644 --- a/rattail/pyramid/views/batches/params/__init__.py +++ b/tailbone/views/batches/params/__init__.py @@ -23,10 +23,10 @@ ################################################################################ """ -``rattail.pyramid.views.batches.params`` -- Batch Parameter Views +Batch Parameter Views """ -from rattail.pyramid.views import View +from ... import View __all__ = ['BatchParamsView'] @@ -49,4 +49,4 @@ class BatchParamsView(View): def includeme(config): - config.include('rattail.pyramid.views.batches.params.labels') + config.include('tailbone.views.batches.params.labels') diff --git a/rattail/pyramid/views/batches/params/labels.py b/tailbone/views/batches/params/labels.py similarity index 90% rename from rattail/pyramid/views/batches/params/labels.py rename to tailbone/views/batches/params/labels.py index 95b956d7..a17337ab 100644 --- a/rattail/pyramid/views/batches/params/labels.py +++ b/tailbone/views/batches/params/labels.py @@ -23,13 +23,13 @@ ################################################################################ """ -``rattail.pyramid.views.batches.params.printlabels`` -- Print Labels Batch +Print Labels Batch """ -from rattail.pyramid import Session +from .... import Session import rattail -from rattail.pyramid.views.batches.params import BatchParamsView +from . import BatchParamsView class PrintLabels(BatchParamsView): diff --git a/rattail/pyramid/views/batches/rows.py b/tailbone/views/batches/rows.py similarity index 97% rename from rattail/pyramid/views/batches/rows.py rename to tailbone/views/batches/rows.py index 134b75aa..ac193d15 100644 --- a/rattail/pyramid/views/batches/rows.py +++ b/tailbone/views/batches/rows.py @@ -23,16 +23,16 @@ ################################################################################ """ -``rattail.pyramid.views.batches.rows`` -- Batch Row Views +Batch Row Views """ from pyramid.httpexceptions import HTTPFound -from rattail.pyramid import Session -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from ... import Session +from .. import SearchableAlchemyGridView, CrudView import rattail -from rattail.pyramid.forms import GPCFieldRenderer +from ...forms import GPCFieldRenderer def field_with_renderer(field, column): diff --git a/rattail/pyramid/views/brands.py b/tailbone/views/brands.py similarity index 96% rename from rattail/pyramid/views/brands.py rename to tailbone/views/brands.py index 6fb31be8..ceaf6d3d 100644 --- a/rattail/pyramid/views/brands.py +++ b/tailbone/views/brands.py @@ -23,11 +23,10 @@ ################################################################################ """ -``rattail.pyramid.views.brands`` -- Brand Views +Brand Views """ -from rattail.pyramid.views import ( - SearchableAlchemyGridView, CrudView, AutocompleteView) +from . import SearchableAlchemyGridView, CrudView, AutocompleteView from rattail.db.model import Brand diff --git a/rattail/pyramid/views/categories.py b/tailbone/views/categories.py similarity index 96% rename from rattail/pyramid/views/categories.py rename to tailbone/views/categories.py index 59b3509d..ed6b9a60 100644 --- a/rattail/pyramid/views/categories.py +++ b/tailbone/views/categories.py @@ -23,10 +23,10 @@ ################################################################################ """ -``rattail.pyramid.views.categories`` -- Category Views +Category Views """ -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from . import SearchableAlchemyGridView, CrudView from rattail.db.model import Category diff --git a/rattail/pyramid/views/core.py b/tailbone/views/core.py similarity index 96% rename from rattail/pyramid/views/core.py rename to tailbone/views/core.py index 36a244e4..10d03b23 100644 --- a/rattail/pyramid/views/core.py +++ b/tailbone/views/core.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.views.core`` -- Core View +Core View """ class View(object): diff --git a/rattail/pyramid/views/crud.py b/tailbone/views/crud.py similarity index 98% rename from rattail/pyramid/views/crud.py rename to tailbone/views/crud.py index 69f24940..68ab3602 100644 --- a/rattail/pyramid/views/crud.py +++ b/tailbone/views/crud.py @@ -23,16 +23,16 @@ ################################################################################ """ -``rattail.pyramid.views.crud`` -- CRUD View +CRUD View """ from pyramid.httpexceptions import HTTPFound import formalchemy -from rattail.pyramid import Session +from .. import Session from edbob.pyramid.forms.formalchemy import AlchemyForm -from rattail.pyramid.views.core import View +from .core import View from edbob.util import requires_impl, prettify diff --git a/rattail/pyramid/views/customergroups.py b/tailbone/views/customergroups.py similarity index 96% rename from rattail/pyramid/views/customergroups.py rename to tailbone/views/customergroups.py index 121e2527..3d478177 100644 --- a/rattail/pyramid/views/customergroups.py +++ b/tailbone/views/customergroups.py @@ -23,12 +23,12 @@ ################################################################################ """ -``rattail.pyramid.views.customergroups`` -- CustomerGroup Views +CustomerGroup Views """ -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from . import SearchableAlchemyGridView, CrudView -from rattail.pyramid import Session +from .. import Session from rattail.db.model import CustomerGroup, CustomerGroupAssignment diff --git a/rattail/pyramid/views/customers.py b/tailbone/views/customers.py similarity index 95% rename from rattail/pyramid/views/customers.py rename to tailbone/views/customers.py index 592a1b39..ac4c31dd 100644 --- a/rattail/pyramid/views/customers.py +++ b/tailbone/views/customers.py @@ -23,22 +23,22 @@ ################################################################################ """ -``rattail.pyramid.views.customers`` -- Customer Views +Customer Views """ from sqlalchemy import and_ from edbob.enum import EMAIL_PREFERENCE -from rattail.pyramid.views import SearchableAlchemyGridView -from rattail.pyramid.forms import EnumFieldRenderer +from . import SearchableAlchemyGridView +from ..forms import EnumFieldRenderer import rattail -from rattail.pyramid import Session +from .. import Session from rattail.db.model import ( Customer, CustomerPerson, CustomerGroupAssignment, CustomerEmailAddress, CustomerPhoneNumber) -from rattail.pyramid.views import CrudView +from . import CrudView class CustomersGrid(SearchableAlchemyGridView): diff --git a/rattail/pyramid/views/departments.py b/tailbone/views/departments.py similarity index 96% rename from rattail/pyramid/views/departments.py rename to tailbone/views/departments.py index 6e24001c..9dd346a5 100644 --- a/rattail/pyramid/views/departments.py +++ b/tailbone/views/departments.py @@ -23,12 +23,11 @@ ################################################################################ """ -``rattail.pyramid.views.departments`` -- Department Views +Department Views """ -from rattail.pyramid.views import ( - SearchableAlchemyGridView, CrudView, AlchemyGridView, AutocompleteView) +from . import SearchableAlchemyGridView, CrudView, AlchemyGridView, AutocompleteView from rattail.db.model import Department, Product, ProductCost, Vendor diff --git a/rattail/pyramid/views/employees.py b/tailbone/views/employees.py similarity index 96% rename from rattail/pyramid/views/employees.py rename to tailbone/views/employees.py index 340a7d80..042c3a50 100644 --- a/rattail/pyramid/views/employees.py +++ b/tailbone/views/employees.py @@ -23,14 +23,14 @@ ################################################################################ """ -``rattail.pyramid.views.employees`` -- Employee Views +Employee Views """ from sqlalchemy import and_ -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView -from rattail.pyramid.grids.search import EnumSearchFilter -from rattail.pyramid.forms import AssociationProxyField, EnumFieldRenderer +from . import SearchableAlchemyGridView, CrudView +from ..grids.search import EnumSearchFilter +from ..forms import AssociationProxyField, EnumFieldRenderer from rattail.db.model import ( Employee, EmployeePhoneNumber, EmployeeEmailAddress, Person) from rattail.enum import EMPLOYEE_STATUS, EMPLOYEE_STATUS_CURRENT diff --git a/tailbone/views/grids/__init__.py b/tailbone/views/grids/__init__.py new file mode 100644 index 00000000..01bfcb4e --- /dev/null +++ b/tailbone/views/grids/__init__.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2012 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for +# more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Rattail. If not, see . +# +################################################################################ + +""" +Grid Views +""" + +from .core import * +from .alchemy import * diff --git a/rattail/pyramid/views/grids/alchemy.py b/tailbone/views/grids/alchemy.py similarity index 96% rename from rattail/pyramid/views/grids/alchemy.py rename to tailbone/views/grids/alchemy.py index f4f21bee..9925a909 100644 --- a/rattail/pyramid/views/grids/alchemy.py +++ b/tailbone/views/grids/alchemy.py @@ -23,14 +23,14 @@ ################################################################################ """ -``rattail.pyramid.views.grids.alchemy`` -- FormAlchemy Grid Views +FormAlchemy Grid Views """ from webhelpers import paginate -from rattail.pyramid.views.grids.core import GridView -from rattail.pyramid import grids -from rattail.pyramid import Session +from .core import GridView +from ... import grids +from ... import Session __all__ = ['AlchemyGridView', 'SortableAlchemyGridView', diff --git a/rattail/pyramid/views/grids/core.py b/tailbone/views/grids/core.py similarity index 93% rename from rattail/pyramid/views/grids/core.py rename to tailbone/views/grids/core.py index fa093ded..157c2817 100644 --- a/rattail/pyramid/views/grids/core.py +++ b/tailbone/views/grids/core.py @@ -23,11 +23,11 @@ ################################################################################ """ -``rattail.pyramid.views.grids.core`` -- Core Grid View +Core Grid View """ -from rattail.pyramid.views import View -from rattail.pyramid import grids +from .. import View +from ... import grids __all__ = ['GridView'] diff --git a/rattail/pyramid/views/labels.py b/tailbone/views/labels.py similarity index 96% rename from rattail/pyramid/views/labels.py rename to tailbone/views/labels.py index 7f8cc469..da0afe68 100644 --- a/rattail/pyramid/views/labels.py +++ b/tailbone/views/labels.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.views.labels`` -- Label Views +Label Views """ from pyramid.httpexceptions import HTTPFound @@ -32,9 +32,9 @@ import formalchemy from webhelpers.html import HTML -from rattail.pyramid import Session -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView -from rattail.pyramid.grids.search import BooleanSearchFilter +from .. import Session +from . import SearchableAlchemyGridView, CrudView +from ..grids.search import BooleanSearchFilter from edbob.pyramid.forms import StrippingFieldRenderer from rattail.db.model import LabelProfile diff --git a/rattail/pyramid/views/people.py b/tailbone/views/people.py similarity index 96% rename from rattail/pyramid/views/people.py rename to tailbone/views/people.py index 3de01766..faa03680 100644 --- a/rattail/pyramid/views/people.py +++ b/tailbone/views/people.py @@ -23,15 +23,14 @@ ################################################################################ """ -``rattail.pyramid.views.people`` -- Person Views +Person Views """ from sqlalchemy import and_ -from rattail.pyramid.views import ( - SearchableAlchemyGridView, CrudView, AutocompleteView) +from . import SearchableAlchemyGridView, CrudView, AutocompleteView -from rattail.pyramid import Session +from .. import Session from rattail.db.model import (Person, PersonEmailAddress, PersonPhoneNumber, VendorContact) diff --git a/rattail/pyramid/views/products.py b/tailbone/views/products.py similarity index 97% rename from rattail/pyramid/views/products.py rename to tailbone/views/products.py index 3e8e20d3..ba28821e 100644 --- a/rattail/pyramid/views/products.py +++ b/tailbone/views/products.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.views.products`` -- Product Views +Product Views """ from sqlalchemy import and_ @@ -36,7 +36,7 @@ from pyramid.renderers import render_to_response import edbob from edbob.pyramid.progress import SessionProgress -from rattail.pyramid.views import SearchableAlchemyGridView +from . import SearchableAlchemyGridView import rattail.labels from rattail import sil @@ -48,10 +48,9 @@ from rattail.db.model import ( Brand, Vendor, Department, Subdepartment, LabelProfile) from rattail.gpc import GPC -from rattail.pyramid import Session -from rattail.pyramid.forms import (AutocompleteFieldRenderer, - GPCFieldRenderer, PriceFieldRenderer) -from rattail.pyramid.views import CrudView +from .. import Session +from ..forms import AutocompleteFieldRenderer, GPCFieldRenderer, PriceFieldRenderer +from . import CrudView class ProductsGrid(SearchableAlchemyGridView): diff --git a/rattail/pyramid/views/reports.py b/tailbone/views/reports.py similarity index 97% rename from rattail/pyramid/views/reports.py rename to tailbone/views/reports.py index 1ca10bf6..f0efee72 100644 --- a/rattail/pyramid/views/reports.py +++ b/tailbone/views/reports.py @@ -30,7 +30,7 @@ from .core import View from mako.template import Template from pyramid.response import Response -from rattail.pyramid import Session +from .. import Session from rattail.db.model import Vendor, Department, Product, ProductCost import re @@ -58,7 +58,7 @@ class OrderingWorksheet(View): This is the "Ordering Worksheet" report. """ - report_template_path = 'rattail.pyramid:reports/ordering_worksheet.mako' + report_template_path = 'tailbone:reports/ordering_worksheet.mako' upc_getter = staticmethod(get_upc) @@ -129,7 +129,7 @@ class InventoryWorksheet(View): This is the "Inventory Worksheet" report. """ - report_template_path = 'rattail.pyramid:reports/inventory_worksheet.mako' + report_template_path = 'tailbone:reports/inventory_worksheet.mako' upc_getter = staticmethod(get_upc) diff --git a/rattail/pyramid/views/roles.py b/tailbone/views/roles.py similarity index 97% rename from rattail/pyramid/views/roles.py rename to tailbone/views/roles.py index 76872a3c..7bdd66a1 100644 --- a/rattail/pyramid/views/roles.py +++ b/tailbone/views/roles.py @@ -23,7 +23,7 @@ ################################################################################ """ -``rattail.pyramid.views.roles`` -- Role Views +Role Views """ from pyramid.httpexceptions import HTTPFound @@ -34,8 +34,8 @@ from webhelpers.html.builder import HTML from edbob.db import auth -from rattail.pyramid import Session -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from .. import Session +from . import SearchableAlchemyGridView, CrudView from rattail.db.model import Role diff --git a/rattail/pyramid/views/stores.py b/tailbone/views/stores.py similarity index 97% rename from rattail/pyramid/views/stores.py rename to tailbone/views/stores.py index 864f2ec0..5a22f383 100644 --- a/rattail/pyramid/views/stores.py +++ b/tailbone/views/stores.py @@ -23,12 +23,12 @@ ################################################################################ """ -``rattail.pyramid.views.stores`` -- Store Views +Store Views """ from sqlalchemy import and_ -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from . import SearchableAlchemyGridView, CrudView from rattail.db.model import Store, StoreEmailAddress, StorePhoneNumber diff --git a/rattail/pyramid/views/subdepartments.py b/tailbone/views/subdepartments.py similarity index 96% rename from rattail/pyramid/views/subdepartments.py rename to tailbone/views/subdepartments.py index 45218239..cc868e55 100644 --- a/rattail/pyramid/views/subdepartments.py +++ b/tailbone/views/subdepartments.py @@ -23,10 +23,10 @@ ################################################################################ """ -``rattail.pyramid.views.subdepartments`` -- Subdepartment Views +Subdepartment Views """ -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView +from . import SearchableAlchemyGridView, CrudView from rattail.db.model import Subdepartment diff --git a/rattail/pyramid/views/users.py b/tailbone/views/users.py similarity index 96% rename from rattail/pyramid/views/users.py rename to tailbone/views/users.py index 740229a7..2cf29a05 100644 --- a/rattail/pyramid/views/users.py +++ b/tailbone/views/users.py @@ -23,15 +23,15 @@ ################################################################################ """ -``rattail.pyramid.views.users`` -- User Views +User Views """ import formalchemy from edbob.pyramid.views import users -from rattail.pyramid.views import SearchableAlchemyGridView, CrudView -from rattail.pyramid.forms import PersonFieldRenderer +from . import SearchableAlchemyGridView, CrudView +from ..forms import PersonFieldRenderer from rattail.db.model import User, Person diff --git a/rattail/pyramid/views/vendors.py b/tailbone/views/vendors.py similarity index 95% rename from rattail/pyramid/views/vendors.py rename to tailbone/views/vendors.py index 3b24b66b..22cd2658 100644 --- a/rattail/pyramid/views/vendors.py +++ b/tailbone/views/vendors.py @@ -23,12 +23,11 @@ ################################################################################ """ -``rattail.pyramid.views.vendors`` -- Vendor Views +Vendor Views """ -from rattail.pyramid.views import ( - SearchableAlchemyGridView, CrudView, AutocompleteView) -from rattail.pyramid.forms import AssociationProxyField, PersonFieldRenderer +from . import SearchableAlchemyGridView, CrudView, AutocompleteView +from ..forms import AssociationProxyField, PersonFieldRenderer from rattail.db.model import Vendor diff --git a/tests/forms/test_simpleform.py b/tests/forms/test_simpleform.py index 09c8d84a..6108a4b3 100644 --- a/tests/forms/test_simpleform.py +++ b/tests/forms/test_simpleform.py @@ -2,7 +2,7 @@ from mock import Mock from .. import TestCase -from rattail.pyramid.forms import simpleform +from tailbone.forms import simpleform class FormRendererTests(TestCase): diff --git a/tests/test_helpers.py b/tests/test_helpers.py index 088592b4..c75a37ea 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -2,7 +2,7 @@ import datetime from . import TestCase -from rattail.pyramid import helpers +from tailbone import helpers class HelpersTests(TestCase): diff --git a/tests/test_root.py b/tests/test_root.py index b8da9f67..40363b88 100644 --- a/tests/test_root.py +++ b/tests/test_root.py @@ -8,4 +8,4 @@ class RootTests(TestCase): """ def test_includeme(self): - self.config.include('rattail.pyramid') + self.config.include('tailbone') diff --git a/tests/test_subscribers.py b/tests/test_subscribers.py index 5a71d8ff..7e63b7c7 100644 --- a/tests/test_subscribers.py +++ b/tests/test_subscribers.py @@ -2,7 +2,7 @@ from mock import Mock from . import TestCase -from rattail.pyramid import subscribers +from tailbone import subscribers class SubscribersTests(TestCase): diff --git a/tests/test_views.py b/tests/test_views.py index ff117d48..648bdf7d 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -8,4 +8,4 @@ class ViewTests(TestCase): """ def test_includeme(self): - self.config.include('rattail.pyramid.views') + self.config.include('tailbone.views') diff --git a/tests/views/test_autocomplete.py b/tests/views/test_autocomplete.py index 870e2ad3..bfb7ad22 100644 --- a/tests/views/test_autocomplete.py +++ b/tests/views/test_autocomplete.py @@ -3,7 +3,7 @@ from mock import Mock from pyramid import testing from .. import TestCase, mock_query -from rattail.pyramid.views import autocomplete +from tailbone.views import autocomplete class BareAutocompleteViewTests(TestCase): diff --git a/tests/views/test_departments.py b/tests/views/test_departments.py index 3b414619..877fecf0 100644 --- a/tests/views/test_departments.py +++ b/tests/views/test_departments.py @@ -3,7 +3,7 @@ from mock import Mock from pyramid import testing from .. import TestCase, mock_query -from rattail.pyramid.views import departments +from tailbone.views import departments class DepartmentsGridTests(TestCase): diff --git a/tests/views/test_reports.py b/tests/views/test_reports.py index 868c4970..2f331938 100644 --- a/tests/views/test_reports.py +++ b/tests/views/test_reports.py @@ -1,2 +1,2 @@ -from rattail.pyramid.views import reports +from tailbone.views import reports