From 61adead5482cdb6fc07921e8bff787b99c980e52 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 30 Aug 2018 02:11:38 -0700 Subject: Update wiki with zodb cookiecutter source files --- docs/tutorials/wiki/src/tests/README.txt | 2 +- docs/tutorials/wiki/src/tests/development.ini | 3 +++ docs/tutorials/wiki/src/tests/production.ini | 3 +++ docs/tutorials/wiki/src/tests/setup.py | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'docs/tutorials/wiki/src/tests') diff --git a/docs/tutorials/wiki/src/tests/README.txt b/docs/tutorials/wiki/src/tests/README.txt index 5ec53bf9d..8a56d14af 100644 --- a/docs/tutorials/wiki/src/tests/README.txt +++ b/docs/tutorials/wiki/src/tests/README.txt @@ -14,7 +14,7 @@ Getting Started - Upgrade packaging tools. - env/bin/pip install --upgrade pip setuptools wheel + env/bin/pip install --upgrade pip setuptools - Install the project in editable mode with its testing requirements. diff --git a/docs/tutorials/wiki/src/tests/development.ini b/docs/tutorials/wiki/src/tests/development.ini index fec08941d..228f18f36 100644 --- a/docs/tutorials/wiki/src/tests/development.ini +++ b/docs/tutorials/wiki/src/tests/development.ini @@ -22,6 +22,9 @@ retry.attempts = 3 # '127.0.0.1' and '::1'. # debugtoolbar.hosts = 127.0.0.1 ::1 +[pshell] +setup = tutorial.pshell.setup + ### # wsgi server configuration ### diff --git a/docs/tutorials/wiki/src/tests/production.ini b/docs/tutorials/wiki/src/tests/production.ini index f2fa8d6d5..46b1e331b 100644 --- a/docs/tutorials/wiki/src/tests/production.ini +++ b/docs/tutorials/wiki/src/tests/production.ini @@ -16,6 +16,9 @@ zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000 retry.attempts = 3 +[pshell] +setup = tutorial.pshell.setup + ### # wsgi server configuration ### diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index 3f0b1317c..7011387f6 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/setup.py @@ -25,7 +25,7 @@ requires = [ tests_require = [ 'WebTest >= 1.3.1', # py3 compat - 'pytest', + 'pytest>=3.7.4', 'pytest-cov', ] -- cgit v1.2.3 From 160e802545a3f42134fbd88f1d71dd7c15fd3ba7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 30 Aug 2018 02:17:37 -0700 Subject: Update wiki with zodb cookiecutter source files --- docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt | 1 - docs/tutorials/wiki/src/tests/tutorial/templates/view.pt | 1 - 2 files changed, 2 deletions(-) (limited to 'docs/tutorials/wiki/src/tests') diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt index 3ef0c7e0e..eedb83da4 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt +++ b/docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt @@ -23,7 +23,6 @@ -

diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt index 5d9478fb9..f2a9249ef 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt +++ b/docs/tutorials/wiki/src/tests/tutorial/templates/view.pt @@ -23,7 +23,6 @@ -

-- cgit v1.2.3 From 6cadff5aca91a799e69d641625d16280791653f6 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 30 Aug 2018 02:18:47 -0700 Subject: Update wiki with zodb cookiecutter source files --- docs/tutorials/wiki/src/tests/.gitignore | 21 +++++++++++++++++++++ docs/tutorials/wiki/src/tests/tutorial/pshell.py | 11 +++++++++++ 2 files changed, 32 insertions(+) create mode 100644 docs/tutorials/wiki/src/tests/.gitignore create mode 100644 docs/tutorials/wiki/src/tests/tutorial/pshell.py (limited to 'docs/tutorials/wiki/src/tests') diff --git a/docs/tutorials/wiki/src/tests/.gitignore b/docs/tutorials/wiki/src/tests/.gitignore new file mode 100644 index 000000000..1853d983c --- /dev/null +++ b/docs/tutorials/wiki/src/tests/.gitignore @@ -0,0 +1,21 @@ +*.egg +*.egg-info +*.pyc +*$py.class +*~ +.coverage +coverage.xml +build/ +dist/ +.tox/ +nosetests.xml +env*/ +tmp/ +Data.fs* +*.sublime-project +*.sublime-workspace +.*.sw? +.sw? +.DS_Store +coverage +test diff --git a/docs/tutorials/wiki/src/tests/tutorial/pshell.py b/docs/tutorials/wiki/src/tests/tutorial/pshell.py new file mode 100644 index 000000000..3d026291b --- /dev/null +++ b/docs/tutorials/wiki/src/tests/tutorial/pshell.py @@ -0,0 +1,11 @@ +from . import models + +def setup(env): + request = env['request'] + + # start a transaction + request.tm.begin() + + # inject some vars into the shell builtins + env['tm'] = request.tm + env['models'] = models -- cgit v1.2.3 From 7633490dd5c70ce93c94c62e08b1a80f8cc2bf6f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 30 Aug 2018 02:30:59 -0700 Subject: Remove unused template --- .../src/tests/tutorial/templates/mytemplate.pt | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt (limited to 'docs/tutorials/wiki/src/tests') diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt deleted file mode 100644 index 1d33787d9..000000000 --- a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - ZODB Scaffold for The Pyramid Web Framework - - - - - - - - - - - - - -

Pyramid ZODB scaffold

Welcome to ${project}, an application generated by
the Pyramid Web Framework 1.7.

Generated by v1.9
Docs
Github Project
IRC Channel
Pylons Project

- - - - - - - - -- cgit v1.2.3