diff options
| author | Joe Gordon <jogo@pinterest.com> | 2021-07-06 11:45:34 -0700 |
|---|---|---|
| committer | Joe Gordon <jogo@pinterest.com> | 2021-07-20 11:49:20 -0700 |
| commit | 09e4c0520482beab2faba9253178e34ec459054e (patch) | |
| tree | 54643b558a90513c632be5d01e692e5244ea322b /tox.ini | |
| parent | 00f3dd5edbb208c17e096ae858ac9f181c1c144a (diff) | |
| download | pymemcache-09e4c0520482beab2faba9253178e34ec459054e.tar.gz | |
Fixes for rebase and further cleanups
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -20,7 +20,6 @@ commands = pip install -e . py.test {posargs:pymemcache/test/ -m integration} -<<<<<<< HEAD [testenv:flake8] # Avoid pulling all the base requirements only to run flake8 deps = flake8 @@ -29,9 +28,6 @@ commands = python setup.py check --restructuredtext [testenv:coverage] -======= -[testenv:py39-flake8] ->>>>>>> 290ad0c (Drop python support 2.7, 3.4 and 3.5) commands = py.test --cov=pymemcache |