summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-20Rename the rest of the **predicates to **view_optionsBert JW Regeer
2015-10-20Add options to the internal _derive_viewBert JW Regeer
This way we can use that in tests.
2015-10-20Add ViewDerivation integration testsBert JW Regeer
This is an integration test in the sense that it adds both a view derivation and then adds a view. That view is then tested to verify that it correctly returns and that the derivations haven't broken anything.
2015-10-20Rename predicates to view_optionsBert JW Regeer
We also use the previously defined names() method on PredicateList to fetch the list of predicates and pull out all predicate values into it's own dictionary. Then the rest of the values are the view options for the view derivations. At the moment we do not check if the options matches a valid view derivation. No seatbelts for view options.
2015-10-20PredicateList learns how to return the namesBert JW Regeer
This is required for future changes, where we need the list of predicate names.
2015-10-20Remove the DummySecurityPolicy tooBert JW Regeer
2015-10-20We don't need no DummyLoggerBert JW Regeer
2015-10-20Views in this test are not calledBert JW Regeer
2015-10-20Merge branch 'master' of github.com:Pylons/pyramid into ↵Bert JW Regeer
feature/configurable-view-deriver
2015-10-20Merge pull request #2017 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns
2015-10-20minor grammar, rewrap 79 columnsSteve Piercy
2015-10-20Merge pull request #2014 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns
2015-10-20minor grammar, rewrap 79 columnsSteve Piercy
2015-10-19Merge pull request #2010 from stevepiercy/masterSteve Piercy
resolve whitespace diff between master and 1.6-branch
2015-10-19resolve whitespace diff between master and 1.6-branchSteve Piercy
2015-10-19Merge pull request #2007 from stevepiercy/masterSteve Piercy
add Method sentence and heading for proutes, minor grammar, rewrap 79…
2015-10-19add Method sentence and heading for proutes, minor grammar, rewrap 79 cols, ↵Steve Piercy
.rst syntax fixes
2015-10-18Fix entrypoints syntax in pshell as part of #1891.Michael Merickel
2015-10-18Merge pull request #2004 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols, .rst syntax fixes
2015-10-18minor grammar, rewrap 79 cols, .rst syntax fixesSteve Piercy
2015-10-18Merge pull request #2001 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols, .rst syntax fixes
2015-10-18minor grammar, rewrap 79 cols, .rst syntax fixesSteve Piercy
2015-10-17Merge pull request #1998 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols, .rst syntax fixes
2015-10-17minor grammar, rewrap 79 cols, .rst syntax fixesSteve Piercy
2015-10-17Merge pull request #1995 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols, .rst syntax fixes
2015-10-17minor grammar, rewrap 79 cols, .rst syntax fixesSteve Piercy
2015-10-16add a shield pointing to #pyramidMichael Merickel
2015-10-16Merge pull request #1994 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols
2015-10-16minor grammar, rewrap 79 colsSteve Piercy
(cherry picked from commit a18960a)
2015-10-16Merge pull request #1989 from stevepiercy/masterSteve Piercy
strip trailing whitespace
2015-10-16strip trailing whitespaceSteve Piercy
2015-10-15Merge pull request #1986 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols, update dead external links, .rst synta…
2015-10-15minor grammar, rewrap 79 cols, update dead external links, .rst syntax, git ↵Steve Piercy
mah intersphinx on yo!
2015-10-14broadcast py35 supportMichael Merickel
2015-10-14Merge pull request #1976 from bertjwregeer/fix/python3.5Michael Merickel
Fix python 3.5 support
2015-10-14update changelog for #1929Michael Merickel
2015-10-14Merge pull request #1929 from jessedhillon/better-pshell-env-helpMichael Merickel
populate pshell's env_help with docstring of values
2015-10-14Merge pull request #1907 from mnaberez/circus-as-pserve-daemonize-replacementMichael Merickel
Mention Circus as a pserve --daemon replacement. Refs #1554, #1641
2015-10-13Merge pull request #1981 from stevepiercy/masterSteve Piercy
minor grammar, add rst directives for versionadded/changed, rewrap 79…
2015-10-13minor grammar, add rst directives for versionadded/changed, rewrap 79 colsSteve Piercy
2015-10-12Merge pull request #1977 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 cols
2015-10-12rewrap 79 colsSteve Piercy
2015-10-12minor grammar, wrap 79 colsSteve Piercy
2015-10-11No cover a branchBert JW Regeer
2015-10-11Fix Python 3.5 supportBert JW Regeer
Python 3.5 inserts an extra stackframe when calling extract_traceback, this adds in a check to see if the last frame is this extra frame, and if so removes it. This doesn't affect any other version of Python.
2015-10-11Make sure we test on Python 3.5Bert JW Regeer
2015-10-11fix broken testMichael Merickel
2015-10-11fix broken sortMichael Merickel
2015-10-11order shells alphabetically instead of prioritizing ipython/bpythonMichael Merickel
2015-10-11Merge pull request #1891 from sontek/use_entry_points_for_shellsMichael Merickel
Use entry points for pshell