Pyramid Alchemy scaffold
-Welcome to \{\{project\}\}, an application generated by
the Pyramid Web Framework {{pyramid_version}}.
diff --git a/pyramid/scaffolds/alchemy/+package+/__init__.py b/pyramid/scaffolds/alchemy/+package+/__init__.py index 3a510a14fd..1168393517 100644 --- a/pyramid/scaffolds/alchemy/+package+/__init__.py +++ b/pyramid/scaffolds/alchemy/+package+/__init__.py @@ -4,8 +4,8 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ config = Configurator(settings=settings) - config.include('pyramid_jinja2') - config.include('.models.meta') + config.include('pyramid_chameleon') + config.include('.models') config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') config.scan() diff --git a/pyramid/scaffolds/alchemy/+package+/models/meta.py b/pyramid/scaffolds/alchemy/+package+/models.py similarity index 80% rename from pyramid/scaffolds/alchemy/+package+/models/meta.py rename to pyramid/scaffolds/alchemy/+package+/models.py index f66d1e5ec9..832e67b379 100644 --- a/pyramid/scaffolds/alchemy/+package+/models/meta.py +++ b/pyramid/scaffolds/alchemy/+package+/models.py @@ -1,3 +1,10 @@ +from sqlalchemy import ( + Column, + Index, + Integer, + Text, + ) + from sqlalchemy import engine_from_config from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker @@ -45,3 +52,11 @@ def get_dbmaker(engine): return dbmaker +class MyModel(Base): + __tablename__ = 'models' + id = Column(Integer, primary_key=True) + name = Column(Text) + value = Column(Integer) + + +Index('my_index', MyModel.name, unique=True, mysql_length=255) diff --git a/pyramid/scaffolds/alchemy/+package+/models/__init__.py b/pyramid/scaffolds/alchemy/+package+/models/__init__.py deleted file mode 100644 index 01c31e4979..0000000000 --- a/pyramid/scaffolds/alchemy/+package+/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# import all models classes here for sqlalchemy mappers -# to pick up -from .mymodel import MyModel diff --git a/pyramid/scaffolds/alchemy/+package+/models/mymodel.py b/pyramid/scaffolds/alchemy/+package+/models/mymodel.py deleted file mode 100644 index b4191aa55a..0000000000 --- a/pyramid/scaffolds/alchemy/+package+/models/mymodel.py +++ /dev/null @@ -1,16 +0,0 @@ -from .meta import Base -from sqlalchemy import ( - Column, - Index, - Integer, - Text, -) - -class MyModel(Base): - __tablename__ = 'models' - id = Column(Integer, primary_key=True) - name = Column(Text) - value = Column(Integer) - - -Index('my_index', MyModel.name, unique=True, mysql_length=255) diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py index f0d09729eb..43e25bff86 100644 --- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py +++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py @@ -9,13 +9,13 @@ from pyramid.scripts.common import parse_vars -from ..models.meta import ( +from ..models import ( + MyModel, Base, get_session, get_engine, get_dbmaker, ) -from ..models.mymodel import MyModel def usage(argv): diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl deleted file mode 100644 index 01fe5b8e33..0000000000 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "layout.jinja2" %} - -{% block content %} -
Welcome to \{\{project\}\}, an application generated by
the Pyramid Web Framework {{pyramid_version}}.