From 66dd3cf3871e584fcd445f417d783509f8c6c1bd Mon Sep 17 00:00:00 2001 From: Jan Vlcinsky Date: Wed, 4 Apr 2018 01:09:21 +0200 Subject: [PATCH 1/5] Man page section about `tox.ini` updated (no need for `pipenv run`) As `pipenv` runs in `command` section in `tox` activated virtualenv, there is no need to run `pipenv run ` and commands can be run directly as ``. This also relaxes the requirement for passing `HOME` environment variable into `pipenv run` call. --- pipenv/pipenv.1 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pipenv/pipenv.1 b/pipenv/pipenv.1 index 18914429..e115f592 100644 --- a/pipenv/pipenv.1 +++ b/pipenv/pipenv.1 @@ -1284,20 +1284,18 @@ 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 + py.test tests [testenv:flake8\-py3] -passenv=HOME basepython = python3.4 commands= {[testenv]deps} pipenv install \-\-dev - pipenv run flake8 \-\-version - pipenv run flake8 setup.py docs project test + flake8 \-\-version + flake8 setup.py docs project test .ft P .fi .UNINDENT @@ -1306,8 +1304,9 @@ commands= \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. +pipenv runs in tox activated virtualenv and installs into it. +That is why there is no need for \fIpipenv run\fP. +Installed commands can be run directly. .UNINDENT .UNINDENT .SS ☤ Shell Completion From 31230b1a37192e4c9768eb0f4747938d0e02c4ef Mon Sep 17 00:00:00 2001 From: Jan Vlcinsky Date: Sat, 7 Apr 2018 23:27:11 +0200 Subject: [PATCH 2/5] Documentation about usage in `tox.ini` updated (shorter call). --- docs/advanced.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index f1abcd83..41147194 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -445,17 +445,17 @@ and external testing:: deps = pipenv commands= pipenv install --dev - pipenv run py.test tests + py.test tests [testenv:flake8-py3] basepython = python3.4 commands= {[testenv]deps} pipenv install --dev - pipenv run flake8 --version - pipenv run flake8 setup.py docs project test + flake8 --version + 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`` From a60077862c605740cef43d221e42f119624ef797 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 11 Apr 2018 00:12:58 -0400 Subject: [PATCH 3/5] Update advanced.rst --- docs/advanced.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index 41147194..5f1852ff 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -452,8 +452,8 @@ and external testing:: commands= {[testenv]deps} pipenv install --dev - flake8 --version - flake8 setup.py docs project test + pipenv run flake8 --version + pipenv run flake8 setup.py docs project test ``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``. From 8d078f8a0b39dd1f824a3e9c70491036771a69c2 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 11 Apr 2018 00:14:05 -0400 Subject: [PATCH 4/5] Update advanced.rst --- docs/advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index 5f1852ff..dfa7356a 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -445,7 +445,7 @@ and external testing:: deps = pipenv commands= pipenv install --dev - py.test tests + pipenv run py.test tests [testenv:flake8-py3] basepython = python3.4 From 44d994fd2e3c48640659de8f1bdf3b652a668232 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 11 Apr 2018 00:16:18 -0400 Subject: [PATCH 5/5] Update pipenv.1 --- pipenv/pipenv.1 | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pipenv/pipenv.1 b/pipenv/pipenv.1 index e115f592..10fc911f 100644 --- a/pipenv/pipenv.1 +++ b/pipenv/pipenv.1 @@ -1287,28 +1287,19 @@ envlist = flake8\-py3, py26, py27, py33, py34, py35, py36, pypy deps = pipenv commands= pipenv install \-\-dev - py.test tests + pipenv run py.test tests [testenv:flake8\-py3] basepython = python3.4 commands= {[testenv]deps} pipenv install \-\-dev - flake8 \-\-version - flake8 setup.py docs project test + pipenv run flake8 \-\-version + pipenv run flake8 setup.py docs project test .ft P .fi .UNINDENT .UNINDENT -.sp -\fBNOTE:\fP -.INDENT 0.0 -.INDENT 3.5 -pipenv runs in tox activated virtualenv and installs into it. -That is why there is no need for \fIpipenv run\fP. -Installed commands can be run directly. -.UNINDENT -.UNINDENT .SS ☤ Shell Completion .sp To enable completion in fish, add this to your config: