Skip to content

Commit

Permalink
Merge pull request #35 from adepue/master
Browse files Browse the repository at this point in the history
pin flake8
  • Loading branch information
Adam DePue committed Feb 11, 2016
2 parents 0358dc4 + 50d866d commit 0a3e7cb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "pypy"
sudo: false
install:
# pylint needs unittest2 to check the test code.
- "pip install -q flake8 pylint nose six --use-mirrors"
- "pip install -q flake8==2.5.2 pylint nose six"
- python -c "import six; exit(not six.PY3)" || pip install unittest2
before_script:
- "flake8 tests src setup.py"
- "pylint -E src/richenum"
- "pylint -E tests/richenum"
- "pylint -E setup.py"
script: "nosetests -s -v"
2 changes: 1 addition & 1 deletion src/richenum/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def members(cls):

@classmethod
def lookup(cls, field, value):
for member in cls:
for member in cls: # pylint: disable=E1133
member_value = getattr(member, field)

if member_value == value:
Expand Down
10 changes: 5 additions & 5 deletions tests/richenum/test_ordered_rich_enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
if PY3:
unicode = str # for flake8, mainly

from richenum import EnumConstructionException
from richenum import EnumLookupError
from richenum import OrderedRichEnum
from richenum import OrderedRichEnumValue
from richenum import RichEnumValue
from richenum import EnumConstructionException # noqa
from richenum import EnumLookupError # noqa
from richenum import OrderedRichEnum # noqa
from richenum import OrderedRichEnumValue # noqa
from richenum import RichEnumValue # noqa


class BreakfastEnumValue(OrderedRichEnumValue):
Expand Down
8 changes: 4 additions & 4 deletions tests/richenum/test_rich_enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
if PY3:
unicode = str # for flake8, mainly

from richenum import EnumConstructionException
from richenum import EnumLookupError
from richenum import RichEnum
from richenum import RichEnumValue
from richenum import EnumConstructionException # noqa
from richenum import EnumLookupError # noqa
from richenum import RichEnum # noqa
from richenum import RichEnumValue # noqa


class VegetableEnumValue(RichEnumValue):
Expand Down

0 comments on commit 0a3e7cb

Please sign in to comment.