diff --git a/.gitignore b/.gitignore index 1c7130929..a192542d6 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ -.tox/ .coverage .coverage.* .cache diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 1ff073da9..1b8f7a3e9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -77,13 +77,12 @@ Ready to contribute? Here's how to set up ``tiatoolbox`` for local development. Now you can make your changes locally. 5. When you're done making changes, check that your changes pass flake8 and the - tests, including testing other Python versions with tox:: + tests:: $ flake8 tiatoolbox tests $ python setup.py test or pytest - $ tox - To get flake8 and tox, just pip install them into your virtualenv. + To get flake8, just pip install them into your virtualenv. 6. Commit your changes and push your branch to GitHub:: diff --git a/Makefile b/Makefile index 21822be50..bbf78b91c 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,6 @@ clean-pyc: ## remove Python file artifacts find . -name '__pycache__' -exec rm -fr {} + clean-test: ## remove test and coverage artifacts - rm -fr .tox/ rm -f .coverage rm -fr htmlcov/ rm -fr .pytest_cache @@ -62,9 +61,6 @@ lint: ## check style with flake8 test: ## run tests quickly with the default Python pytest -test-all: ## run tests on every Python version with tox - tox - coverage: ## check code coverage quickly with the default Python pytest --cov=tiatoolbox --cov-report=term --cov-report=html --cov-report=xml $(BROWSER) htmlcov/index.html diff --git a/pyproject.toml b/pyproject.toml index 14ec1da83..c6924538e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,6 @@ | \.git | \.hg | \.mypy_cache - | \.tox | \.venv | _build | buck-out diff --git a/requirements_dev.txt b/requirements_dev.txt index 4dfb5e397..f90e6c59d 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -14,6 +14,5 @@ pytest>=7.2.0 pytest-cov>=4.0.0 pytest-runner>=6.0 toml>=0.10.2 -tox>=3.27.1 twine>=4.0.1 wheel>=0.37.1 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 955db570d..000000000 --- a/tox.ini +++ /dev/null @@ -1,47 +0,0 @@ -[tox] -envlist = flake8, black, py38, py39, py310 -requires = tox-conda -skip_missing_interpreters=true - -[travis] -python = - 3.10: py310 - 3.9: py39 - 3.8: py38 - -[testenv:flake8] -basepython = python -deps = flake8 -commands = flake8 tiatoolbox tests - -[testenv:black] -basepython = python -deps = black -commands = black --check tiatoolbox - -[testenv] -setenv = - PYTHONPATH = {toxinidir} -conda_deps= - openjpeg>=2.4.0 -conda_channels= - conda-forge -passenv = - TRAVIS CI -deps = - pytest-cov==3.0.0 - pytest-runner==5.2 - pytest==6.2.5 - coverage==6.3.2 - toml==0.10.2 - -r{toxinidir}/requirements.txt -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following line: -; -r{toxinidir}/requirements.txt -commands = - pip install -U pip - pytest --basetemp={envtmpdir} \ - --cov=tiatoolbox --cov-report=term --cov-report=xml \ - --capture=sys \ - --durations=10 --durations-min=1.0 \ - --maxfail=1