Merge branch 'master' into bugfix/keep-outdated-keyerror

pypa · May 27, 2019 · 9f1fb72 · 9f1fb72
2 parents 51e2be7 + f8bace8
commit 9f1fb72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/advanced.rst b/docs/advanced.rst
@@ -467,7 +467,7 @@ and the corresponding Makefile::
         pipenv install --dev
 
     test:
-        pipenv run py.test tests
+        pipenv run pytest tests
 
 
 Tox Automation Project
@@ -483,7 +483,7 @@ and external testing::
     deps = pipenv
     commands=
         pipenv install --dev
-        pipenv run py.test tests
+        pipenv run pytest tests
 
     [testenv:flake8-py3]
     basepython = python3.4
@@ -492,7 +492,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``. 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``.
+Pipenv will automatically use the virtualenv provided by ``tox``. If ``pipenv install --dev`` installs e.g. ``pytest``, then installed command ``pytest`` will be present in given virtualenv and can be called directly by ``pytest tests`` instead of ``pipenv run pytest 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

diff --git a/news/3759.doc.rst b/news/3759.doc.rst
@@ -0,0 +1 @@
+Updated the documentation with the new ``pytest`` entrypoint.