Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: python
cache: pip
matrix:
include:
- env: TOXENV=pycodestyle
- env: TOXENV=flake8
- python: 2.7
env: TOXENV=py27-plain
- python: 2.7
Expand Down Expand Up @@ -39,4 +39,4 @@ install:
script:
- tox
after_success:
- "if [[ $TOXENV != 'pycodestyle' ]]; then codecov; fi"
- "if [[ $TOXENV != 'flake8' ]]; then codecov; fi"
1 change: 0 additions & 1 deletion benchmarks/command_packer_benchmark.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import socket
import sys
from redis.connection import (Connection, SYM_STAR, SYM_DOLLAR, SYM_EMPTY,
SYM_CRLF)
from redis._compat import imap
Expand Down
1 change: 1 addition & 0 deletions redis/_compat.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Internal module for Python 2 backwards compatibility."""
# flake8: noqa
import errno
import socket
import sys
Expand Down
1 change: 0 additions & 1 deletion redis/client.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import unicode_literals
from itertools import chain
import datetime
import sys
import warnings
import time
import threading
Expand Down
1 change: 0 additions & 1 deletion redis/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import io
import os
import socket
import sys
import threading
import warnings

Expand Down
2 changes: 1 addition & 1 deletion redis/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


try:
import hiredis
import hiredis # noqa
HIREDIS_AVAILABLE = True
except ImportError:
HIREDIS_AVAILABLE = False
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
[options.extras_require]
hiredis = hiredis>=0.1.3

[pycodestyle]
show-source = 1
[flake8]
exclude = .venv,.tox,dist,docs,build,*.egg,redis_install

[bdist_wheel]
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.4
envlist = {py27,py35,py36,py37,py38,py,py3}-{plain,hiredis}, pycodestyle
envlist = {py27,py35,py36,py37,py38,py,py3}-{plain,hiredis}, flake8

[testenv]
deps =
Expand All @@ -11,9 +11,9 @@ extras =
hiredis: hiredis
commands = {envpython} -b -m coverage run -m pytest -W always {posargs}

[testenv:pycodestyle]
[testenv:flake8]
basepython = python3.6
deps = pycodestyle
commands = pycodestyle
deps = flake8
commands = flake8
skipsdist = true
skip_install = true