From cf937b6b79c418fc60def3cc58352033b2f98493 Mon Sep 17 00:00:00 2001 From: Shageldi Ovezov <44060682+ovezovs@users.noreply.github.com> Date: Fri, 26 Jun 2020 11:22:06 -0400 Subject: [PATCH] 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 --- .gitignore | 1 - CHANGELOG.rst | 2 ++ CONTRIBUTING.rst | 14 +------------- Makefile | 10 ++-------- requirements-dev.txt | 1 - setup.cfg | 2 +- tox.ini | 23 ----------------------- 7 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 tox.ini diff --git a/.gitignore b/.gitignore index 11d04d10..71e23616 100644 --- a/.gitignore +++ b/.gitignore @@ -52,7 +52,6 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ -.tox/ .nox/ .coverage .coverage.* diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a455588e..1e23a1b9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,7 @@ This project adheres to `Semantic Versioning `_. ------------------------- * 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`_). +* Removed Tox testing entirely (`#943`_). `2.2.0`_ (2020-06-18) @@ -461,3 +462,4 @@ This project adheres to `Semantic Versioning `_. .. _#925: https://github.com/jakubroztocil/httpie/issues/925 .. _#932: https://github.com/jakubroztocil/httpie/issues/932 .. _#934: https://github.com/jakubroztocil/httpie/issues/934 +.. _#943: https://github.com/jakubroztocil/httpie/issues/943 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8ecff67f..b51039a3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -123,8 +123,7 @@ so please make sure all checks pass. Running tests locally ********************* -HTTPie uses the `pytest`_ runner. It also uses `Tox`_ which allows you to run -tests on multiple Python versions even when testing locally. +HTTPie uses the `pytest`_ runner. .. code-block:: bash @@ -135,9 +134,6 @@ tests on multiple Python versions even when testing locally. # Run tests with coverage make test-cover - # Run all tests in all of the supported and available Pythons via Tox - make test-tox - # Test PEP8 compliance 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::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. @@ -172,8 +162,6 @@ See `Makefile`_ for additional development utilities. 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 .. _AUTHORS: https://github.com/jakubroztocil/httpie/blob/master/AUTHORS.rst .. _Makefile: https://github.com/jakubroztocil/httpie/blob/master/Makefile diff --git a/Makefile b/Makefile index 50637c9e..e998cbfa 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ clean: rm -rf $(VENV_ROOT) # Remove symlink for virtualenvwrapper, if we’ve created one. [ -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 @echo @@ -86,7 +86,7 @@ test-cover: test # 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 @@ -94,12 +94,6 @@ test-dist: test-sdist test-bdist-wheel @echo -test-tox: uninstall-httpie install - @echo $(H1)Running tests on all Pythons via Tox$(H1END) - $(VENV_BIN)/tox - @echo - - test-sdist: clean venv @echo $(H1)Testing sdist build an installation$(H1END) $(VENV_PYTHON) setup.py sdist diff --git a/requirements-dev.txt b/requirements-dev.txt index e0ccd39c..8e755e73 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,3 @@ -tox mock pytest pytest-cov diff --git a/setup.cfg b/setup.cfg index 7ae33761..e672f486 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,7 +10,7 @@ addopts = --tb=native [pycodestyle] # -exclude = .git,.idea,__pycache__,build,dist,.tox,.pytest_cache,*.egg-info +exclude = .git,.idea,__pycache__,build,dist,.pytest_cache,*.egg-info # # E241 - multiple spaces after ‘,’ diff --git a/tox.ini b/tox.ini deleted file mode 100644 index d44bce8f..00000000 --- a/tox.ini +++ /dev/null @@ -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}