diff --git a/.dockerignore b/.dockerignore index 7b9bc9b2df..4dc633c1a6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ **/__pycache__ **/*.pyc -.tox .coverage .coverage.* diff --git a/.flake8 b/.flake8 index 6c663473e4..73b4a96bb6 100644 --- a/.flake8 +++ b/.flake8 @@ -4,7 +4,6 @@ exclude = *.egg-info, *.pyc, .git, - .tox, .venv*, build, docs/*, diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a3b0b0e4e7..722906b048 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ _Please make sure to review and check all of these items:_ -- [ ] Does `$ tox` pass with this change (including linting)? +- [ ] Do tests and lints pass with this change? - [ ] Do the CI tests pass with this change (enable it first in your forked repo and wait for the github action build to finish)? - [ ] Is the new or changed code fully tested? - [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)? diff --git a/.github/wordlist.txt b/.github/wordlist.txt index be16c437ff..22ae767e46 100644 --- a/.github/wordlist.txt +++ b/.github/wordlist.txt @@ -132,7 +132,6 @@ thevalueofmykey timeseries toctree topk -tox triaging txt un diff --git a/.gitignore b/.gitignore index b392a2d748..3baa34034f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ redis.egg-info build/ dist/ dump.rdb -/.tox _build vagrant/.vagrant .python-version diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1081f4cb46..4da55c737c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,16 +78,9 @@ It is possible to run only Redis client tests (with cluster mode disabled) by using `invoke standalone-tests`; similarly, RedisCluster tests can be run by using `invoke cluster-tests`. -Each run of tox starts and stops the various dockers required. Sometimes +Each run of tests starts and stops the various dockers required. Sometimes things get stuck, an `invoke clean` can help. -Continuous Integration uses these same wrappers to run all of these -tests against multiple versions of python. Feel free to test your -changes against all the python versions supported, as declared by the -tox.ini file (eg: tox -e py39). If you have the various python versions -on your desktop, you can run *tox* by itself, to test all supported -versions. - ### Docker Tips Following are a few tips that can help you work with the Docker-based @@ -97,10 +90,6 @@ To get a bash shell inside of a container: `$ docker run -it /bin/bash` -**Note**: The term \"service\" refers to the \"services\" defined in the -`tox.ini` file at the top of the repo: \"master\", \"replicaof\", -\"sentinel_1\", \"sentinel_2\", \"sentinel_3\". - Containers run a minimal Debian image that probably lacks tools you want to use. To install packages, first get a bash session (see previous tip) and then run: @@ -111,23 +100,6 @@ You can see the logging output of a containers like this: `$ docker logs -f ` -The command make test runs all tests in all tested Python -environments. To run the tests in a single environment, like Python 3.9, -use a command like this: - -`$ docker-compose run test tox -e py39 -- --redis-url=redis://master:6379/9` - -Here, the flag `-e py39` runs tests against the Python 3.9 tox -environment. And note from the example that whenever you run tests like -this, instead of using make test, you need to pass -`-- --redis-url=redis://master:6379/9`. This points the tests at the -\"master\" container. - -Our test suite uses `pytest`. You can run a specific test suite against -a specific Python version like this: - -`$ docker-compose run test tox -e py37 -- --redis-url=redis://master:6379/9 tests/test_commands.py` - ### Troubleshooting If you get any errors when running `make dev` or `make test`, make sure diff --git a/dev_requirements.txt b/dev_requirements.txt index cdb3774ab6..3715599af0 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -8,7 +8,6 @@ packaging>=20.4 pytest==7.2.0 pytest-timeout==2.1.0 pytest-asyncio>=0.20.2 -tox==3.27.1 invoke==1.7.3 pytest-cov>=4.0.0 vulture>=2.3.0