From 7cbdf2c608c79b7a72ac47e7d4b06c0c82815516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= Date: Mon, 3 May 2021 18:40:25 +0200 Subject: [PATCH] Prefer usage of pytest rather than py.test (#1058) `py.test` was chosen over `pytest` but it is not planned for removal yet [1]. Anyway, it is a good thing to ensure we are using the correct Python version with the right `pytest` installed, so using `python -m pytest` is recommended. [1] https://github.com/pytest-dev/pytest/issues/1629 --- CONTRIBUTING.rst | 10 +++++----- Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 166076fb..0e61ccea 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -116,7 +116,7 @@ the ``http`` command should point to your development copy: (Btw, you don’t need to activate the virtual environment if you just want run some of the ``make`` tasks. You can also invoke the development version of HTTPie directly with ``./venv/bin/http`` without having to activate -the environment first. The same goes for ``./venv/bin/py.test``, etc.). +the environment first. The same goes for ``./venv/bin/pytest``, etc.). Making Changes @@ -167,9 +167,9 @@ can run specific tests from the terminal: .. code-block:: bash # Run specific tests on the current Python - py.test tests/test_uploads.py - py.test tests/test_uploads.py::TestMultipartFormDataFileUpload - py.test tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok + python -m pytest tests/test_uploads.py + python -m pytest tests/test_uploads.py::TestMultipartFormDataFileUpload + python -m pytest tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok ----- @@ -221,7 +221,7 @@ Use ``pytest`` to run tests locally with an active virtual environment: .. code-block:: bash # Run all tests - py.test + python -m pytest ----- diff --git a/Makefile b/Makefile index fa5c7d88..07542e49 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ venv: test: @echo $(H1)Running tests$(HEADER_EXTRA)$(H1END) - $(VENV_BIN)/py.test $(COV) ./httpie $(COV) ./tests --doctest-modules --verbose ./httpie ./tests + $(VENV_BIN)/python -m pytest $(COV) ./httpie $(COV) ./tests --doctest-modules --verbose ./httpie ./tests @echo