Skip to content

Commit

Permalink
Prefer usage of pytest rather than py.test (#1058)
Browse files Browse the repository at this point in the history
`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] pytest-dev/pytest#1629
  • Loading branch information
Mickaël Schoentgen authored May 3, 2021
1 parent 1274d86 commit 7cbdf2c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
-----

Expand Down Expand Up @@ -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
-----
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 7cbdf2c

Please sign in to comment.