Skip to content

Commit

Permalink
Merge pull request #1902 from vlcinsky/man_tox
Browse files Browse the repository at this point in the history
Man page section about `tox.ini` updated
  • Loading branch information
techalchemy committed Apr 11, 2018
2 parents 3b13309 + 36b1499 commit d2b0580
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion docs/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ and external testing::
pipenv run flake8 --version
pipenv run flake8 setup.py docs project test

``pipenv`` will automatically use the virtualenv provided by ``tox``.
``pipenv`` will automatically use the virtualenv provided by ``tox``. If ``pipenv install --dev`` installs e.g. ``pytest``, then installed command ``py.test`` will be present in given virtualenv and can be called directly by ``py.test tests`` instead of ``pipenv run py.test tests``.

You might also want to add ``--ignore-pipfile`` to ``pipenv install``, as to
not accidentally modify the lock-file on each test run. This causes ``pipenv``
Expand Down
10 changes: 0 additions & 10 deletions pipenv/pipenv.1
Original file line number Diff line number Diff line change
Expand Up @@ -1284,14 +1284,12 @@ and external testing:
envlist = flake8\-py3, py26, py27, py33, py34, py35, py36, pypy

[testenv]
passenv=HOME
deps = pipenv
commands=
pipenv install \-\-dev
pipenv run py.test tests

[testenv:flake8\-py3]
passenv=HOME
basepython = python3.4
commands=
{[testenv]deps}
Expand All @@ -1302,14 +1300,6 @@ commands=
.fi
.UNINDENT
.UNINDENT
.sp
\fBNOTE:\fP
.INDENT 0.0
.INDENT 3.5
With Pipenv\(aqs default configuration, you\(aqll need to use tox\(aqs \fBpassenv\fP parameter
to pass your shell\(aqs \fBHOME\fP variable.
.UNINDENT
.UNINDENT
.SS ☤ Shell Completion
.sp
To enable completion in fish, add this to your config:
Expand Down

0 comments on commit d2b0580

Please sign in to comment.