summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/quick_tour.rst4
-rw-r--r--setup.cfg48
-rw-r--r--tox.ini8
3 files changed, 53 insertions, 7 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 39b4cafb3..451830687 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -504,7 +504,7 @@ Pyramid's ``pcreate`` command can list the available scaffolds:
.. code-block:: bash
- $ pcreate --list
+ $ $VENV/bin/pcreate --list
Available scaffolds:
alchemy: Pyramid project using SQLAlchemy, SQLite, URL dispatch, and Jinja2
pyramid_jinja2_starter: Pyramid Jinja2 starter project
@@ -517,7 +517,7 @@ that scaffold to make our project:
.. code-block:: bash
- $ pcreate --scaffold pyramid_jinja2_starter hello_world
+ $ $VENV/bin/pcreate --scaffold pyramid_jinja2_starter hello_world
We next use the normal Python command to set up our package for development:
diff --git a/setup.cfg b/setup.cfg
index b52d24bdb..9a241ddf5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,52 @@ docs = develop easy_install pyramid[docs]
universal = 1
[flake8]
-ignore = E301,E302,E731,E261,E123,E121,E128,E129,E125,W291,E501,W293,E303,W391,E266,E231,E201,E202,E127,E262,E265
+ignore =
+ # E121: continuation line under-indented for hanging indent
+ E121,
+ # E123: closing bracket does not match indentation of opening bracket's line
+ E123,
+ # E125: continuation line with same indent as next logical line
+ E125,
+ # E127: continuation line over-indented for visual indent
+ E127,
+ # E128: continuation line under-indented for visual indent
+ E128,
+ # E129: visually indented line with same indent as next logical line
+ E129,
+ # E201: whitespace after '('
+ E201,
+ # E202: whitespace before ')'
+ E202,
+ # E231: missing whitespace after ',', ';', or ':'
+ E231,
+ # E261: at least two spaces before inline comment
+ E261,
+ # E262: inline comment should start with '# '
+ E262,
+ # E265: block comment should start with '# '
+ E265,
+ # E266: too many leading '#' for block comment
+ E266,
+ # E301: expected 1 blank line, found 0
+ E301,
+ # E302: expected 2 blank lines, found 0
+ E302,
+ # E303: too many blank lines (3)
+ E303,
+ # E305: expected 2 blank lines after class or function definition, found 1
+ E305,
+ # E306: expected 1 blank line before a nested definition, found 0
+ E306,
+ # E501: line too long (82 > 79 characters)
+ E501,
+ # E731: do not assign a lambda expression, use a def
+ E731,
+ # W291: trailing whitespace
+ W291,
+ # W293: blank line contains whitespace
+ W293,
+ # W391: blank line at end of file
+ W391
exclude = pyramid/tests/,pyramid/compat.py,pyramid/resource.py
show-source = True
diff --git a/tox.ini b/tox.ini
index 884b78c68..d1df0f031 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
py27,py34,py35,py36,py37,pypy,
docs,pep8,
{py2,py3}-cover,coverage,
-skip-missing-interpreters = True
+skip_missing_interpreters = True
[testenv]
# Most of these are defaults but if you specify any you can't fall back
@@ -19,7 +19,7 @@ basepython =
py3: python3.5
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
[testenv:py27-scaffolds]
@@ -72,7 +72,7 @@ commands =
# combination of versions of coverage and nosexcover that i can find.
[testenv:py2-cover]
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
coverage run --source=pyramid {envbindir}/nosetests
coverage xml -o coverage-py2.xml
setenv =
@@ -80,7 +80,7 @@ setenv =
[testenv:py3-cover]
commands =
- pip install pyramid[testing]
+ pip install -q pyramid[testing]
coverage run --source=pyramid {envbindir}/nosetests
coverage xml -o coverage-py3.xml
setenv =