Remove tox (#944)

* Removed the instructions of tox testing

* Deleted tox.ini

* removed tox from requirements

* removed tox from setup.cfg

* removed tox from the Makefile

* removed tox from contributing docs

* updated the CHANGELOG

* removed tox from .gitignore
This commit is contained in:
Shageldi Ovezov 2020-06-26 11:22:06 -04:00 committed by GitHub
parent 14677bd25d
commit cf937b6b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 47 deletions

1
.gitignore vendored
View File

@ -52,7 +52,6 @@ pip-delete-this-directory.txt
# Unit test / coverage reports # Unit test / coverage reports
htmlcov/ htmlcov/
.tox/
.nox/ .nox/
.coverage .coverage
.coverage.* .coverage.*

View File

@ -10,6 +10,7 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
------------------------- -------------------------
* Added support for combining cookies specified on the CLI and in a session file (`#932`_). * Added support for combining cookies specified on the CLI and in a session file (`#932`_).
* Added out of the box SOCKS support with no extra installation (`#904`_). * Added out of the box SOCKS support with no extra installation (`#904`_).
* Removed Tox testing entirely (`#943`_).
`2.2.0`_ (2020-06-18) `2.2.0`_ (2020-06-18)
@ -461,3 +462,4 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
.. _#925: https://github.com/jakubroztocil/httpie/issues/925 .. _#925: https://github.com/jakubroztocil/httpie/issues/925
.. _#932: https://github.com/jakubroztocil/httpie/issues/932 .. _#932: https://github.com/jakubroztocil/httpie/issues/932
.. _#934: https://github.com/jakubroztocil/httpie/issues/934 .. _#934: https://github.com/jakubroztocil/httpie/issues/934
.. _#943: https://github.com/jakubroztocil/httpie/issues/943

View File

@ -123,8 +123,7 @@ so please make sure all checks pass.
Running tests locally Running tests locally
********************* *********************
HTTPie uses the `pytest`_ runner. It also uses `Tox`_ which allows you to run HTTPie uses the `pytest`_ runner.
tests on multiple Python versions even when testing locally.
.. code-block:: bash .. code-block:: bash
@ -135,9 +134,6 @@ tests on multiple Python versions even when testing locally.
# Run tests with coverage # Run tests with coverage
make test-cover make test-cover
# Run all tests in all of the supported and available Pythons via Tox
make test-tox
# Test PEP8 compliance # Test PEP8 compliance
make pycodestyle make pycodestyle
@ -158,12 +154,6 @@ can run specific tests from the terminal:
py.test tests/test_uploads.py::TestMultipartFormDataFileUpload py.test tests/test_uploads.py::TestMultipartFormDataFileUpload
py.test tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok py.test tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok
# Run specific tests on the on all Pythons via Tox
# (change to `tox -e py37' to limit Python version)
tox -- tests/test_uploads.py --verbose
tox -- tests/test_uploads.py::TestMultipartFormDataFileUpload --verbose
tox -- tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok --verbose
----- -----
See `Makefile`_ for additional development utilities. See `Makefile`_ for additional development utilities.
@ -172,8 +162,6 @@ See `Makefile`_ for additional development utilities.
Finally, don't forget to add yourself to `AUTHORS`_! Finally, don't forget to add yourself to `AUTHORS`_!
.. _Tox: http://tox.testrun.org
.. _supported Python environments: https://github.com/jakubroztocil/httpie/blob/master/tox.ini
.. _existing issues: https://github.com/jakubroztocil/httpie/issues?state=open .. _existing issues: https://github.com/jakubroztocil/httpie/issues?state=open
.. _AUTHORS: https://github.com/jakubroztocil/httpie/blob/master/AUTHORS.rst .. _AUTHORS: https://github.com/jakubroztocil/httpie/blob/master/AUTHORS.rst
.. _Makefile: https://github.com/jakubroztocil/httpie/blob/master/Makefile .. _Makefile: https://github.com/jakubroztocil/httpie/blob/master/Makefile

View File

@ -38,7 +38,7 @@ clean:
rm -rf $(VENV_ROOT) rm -rf $(VENV_ROOT)
# Remove symlink for virtualenvwrapper, if weve created one. # Remove symlink for virtualenvwrapper, if weve created one.
[ -n "$(WORKON_HOME)" -a -L "$(WORKON_HOME)/httpie" -a -f "$(WORKON_HOME)/httpie" ] && rm $(WORKON_HOME)/httpie || true [ -n "$(WORKON_HOME)" -a -L "$(WORKON_HOME)/httpie" -a -f "$(WORKON_HOME)/httpie" ] && rm $(WORKON_HOME)/httpie || true
rm -rf .tox *.egg dist build .coverage .cache .pytest_cache httpie.egg-info rm -rf *.egg dist build .coverage .cache .pytest_cache httpie.egg-info
find . -name '__pycache__' -delete -o -name '*.pyc' -delete find . -name '__pycache__' -delete -o -name '*.pyc' -delete
@echo @echo
@ -86,7 +86,7 @@ test-cover: test
# test-all is meant to test everything — even this Makefile # test-all is meant to test everything — even this Makefile
test-all: clean install test test-tox test-dist pycodestyle test-all: clean install test test-dist pycodestyle
@echo @echo
@ -94,12 +94,6 @@ test-dist: test-sdist test-bdist-wheel
@echo @echo
test-tox: uninstall-httpie install
@echo $(H1)Running tests on all Pythons via Tox$(H1END)
$(VENV_BIN)/tox
@echo
test-sdist: clean venv test-sdist: clean venv
@echo $(H1)Testing sdist build an installation$(H1END) @echo $(H1)Testing sdist build an installation$(H1END)
$(VENV_PYTHON) setup.py sdist $(VENV_PYTHON) setup.py sdist

View File

@ -1,4 +1,3 @@
tox
mock mock
pytest pytest
pytest-cov pytest-cov

View File

@ -10,7 +10,7 @@ addopts = --tb=native
[pycodestyle] [pycodestyle]
# <http://pycodestyle.pycqa.org/en/latest/intro.html#configuration> # <http://pycodestyle.pycqa.org/en/latest/intro.html#configuration>
exclude = .git,.idea,__pycache__,build,dist,.tox,.pytest_cache,*.egg-info exclude = .git,.idea,__pycache__,build,dist,.pytest_cache,*.egg-info
# <http://pycodestyle.pycqa.org/en/latest/intro.html#error-codes> # <http://pycodestyle.pycqa.org/en/latest/intro.html#error-codes>
# E241 - multiple spaces after , # E241 - multiple spaces after ,

23
tox.ini
View File

@ -1,23 +0,0 @@
# Tox (http://tox.testrun.org/) is a tool for running tests
# in multiple virtualenvs. See ./CONTRIBUTING.rst
[tox]
# pypy3 currently fails because of a Flask issue
envlist = py37
[testenv]
deps =
mock
pytest
pytest-httpbin>=0.0.6
commands =
# NOTE: the order of the directories in posargs seems to matter.
# When changed, then many ImportMismatchError exceptions occurrs.
py.test \
--verbose \
--doctest-modules \
{posargs:./httpie ./tests}