Steve Piercy
2018-06-29 c71eeae50ed148407c530de783f808cece8537e1
Resynch src files to cookiecutter
12 files modified
55 ■■■■■ changed files
docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initialize_db.py 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/layout.jinja2 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.jinja2 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/views/default.py 6 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/scripts/initialize_db.py 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/templates/layout.jinja2 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/README.txt 12 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/production.ini 6 ●●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/pytest.ini 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/layout.jinja2 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/views/default.py 11 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initialize_db.py
@@ -8,7 +8,7 @@
def setup_models(dbsession):
    model = models.MyModel(name='one', value=1)
    model = models.mymodel.MyModel(name='one', value=1)
    dbsession.add(model)
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/layout.jinja2
@@ -16,7 +16,7 @@
    <!-- Custom styles for this scaffold -->
    <link href="{{request.static_url('tutorial:static/theme.css')}}" rel="stylesheet">
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!-- HTML5 shiv and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script>
      <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script>
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.jinja2
@@ -5,4 +5,4 @@
  <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Alchemy project</span></h1>
  <p class="lead">Welcome to <span class="font-normal">{{project}}</span>, a&nbsp;Pyramid application generated&nbsp;by<br><span class="font-normal">Cookiecutter</span>.</p>
</div>
{% endblock content %}
{% endblock content %}
docs/tutorials/wiki2/src/basiclayout/tutorial/views/default.py
@@ -3,14 +3,14 @@
from sqlalchemy.exc import DBAPIError
from ..models import MyModel
from .. import models
@view_config(route_name='home', renderer='../templates/mytemplate.jinja2')
def my_view(request):
    try:
        query = request.dbsession.query(MyModel)
        one = query.filter(MyModel.name == 'one').first()
        query = request.dbsession.query(models.MyModel)
        one = query.filter(models.MyModel.name == 'one').first()
    except DBAPIError:
        return Response(db_err_msg, content_type='text/plain', status=500)
    return {'one': one, 'project': 'myproj'}
docs/tutorials/wiki2/src/installation/tutorial/scripts/initialize_db.py
@@ -8,7 +8,7 @@
def setup_models(dbsession):
    model = models.MyModel(name='one', value=1)
    model = models.mymodel.MyModel(name='one', value=1)
    dbsession.add(model)
docs/tutorials/wiki2/src/installation/tutorial/templates/layout.jinja2
@@ -16,7 +16,7 @@
    <!-- Custom styles for this scaffold -->
    <link href="{{request.static_url('tutorial:static/theme.css')}}" rel="stylesheet">
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!-- HTML5 shiv and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script>
      <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script>
docs/tutorials/wiki2/src/models/README.txt
@@ -20,7 +20,17 @@
    env/bin/pip install -e ".[testing]"
- Configure the database.
- Initialize and upgrade the database using Alembic.
    - Generate your first revision.
        env/bin/alembic -c development.ini revision --autogenerate -m "init"
    - Upgrade to that revision.
        env/bin/alembic -c development.ini upgrade head
- Load default data into the database using a script.
    env/bin/initialize_tutorial_db development.ini
docs/tutorials/wiki2/src/models/development.ini
@@ -26,6 +26,12 @@
# wsgi server configuration
###
[alembic]
# path to migration scripts
script_location = tutorial/alembic
file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
# file_template = %%(rev)s_%%(slug)s
[server:main]
use = egg:waitress#main
listen = localhost:6543
docs/tutorials/wiki2/src/models/production.ini
@@ -20,6 +20,12 @@
# wsgi server configuration
###
[alembic]
# path to migration scripts
script_location = tutorial/alembic
file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
# file_template = %%(rev)s_%%(slug)s
[server:main]
use = egg:waitress#main
listen = *:6543
docs/tutorials/wiki2/src/models/pytest.ini
@@ -1,3 +1,3 @@
[pytest]
testpaths = tutorial
python_files = *.py
python_files = test*.py
docs/tutorials/wiki2/src/models/tutorial/templates/layout.jinja2
@@ -16,7 +16,7 @@
    <!-- Custom styles for this scaffold -->
    <link href="{{request.static_url('tutorial:static/theme.css')}}" rel="stylesheet">
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!-- HTML5 shiv and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script>
      <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script>
docs/tutorials/wiki2/src/models/tutorial/views/default.py
@@ -3,14 +3,14 @@
from sqlalchemy.exc import DBAPIError
from ..models import MyModel
from .. import models
@view_config(route_name='home', renderer='../templates/mytemplate.jinja2')
def my_view(request):
    try:
        query = request.dbsession.query(MyModel)
        one = query.filter(MyModel.name == 'one').first()
        query = request.dbsession.query(models.MyModel)
        one = query.filter(models.MyModel.name == 'one').first()
    except DBAPIError:
        return Response(db_err_msg, content_type='text/plain', status=500)
    return {'one': one, 'project': 'myproj'}
@@ -20,9 +20,8 @@
Pyramid is having a problem using your SQL database.  The problem
might be caused by one of the following things:
1.  You may need to run the "initialize_tutorial_db" script
    to initialize your database tables.  Check your virtual
    environment's "bin" directory for this script and try to run it.
1.  You may need to initialize your database tables with `alembic`.
    Check your README.txt for description and try to run it.
2.  Your database server may not be running.  Check that the
    database server referred to by the "sqlalchemy.url" setting in