Skip to content

Commit 06f7a70

Browse files
committed
Add isort and pep8 checks
- Fix isort and pep8 compliancy
1 parent 9bf1570 commit 06f7a70

14 files changed

+48
-18
lines changed

.isort.cfg

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[settings]
2+
known_first_party=intervals
3+
line_length=79
4+
multi_line_output=3
5+
not_skip=__init__.py
6+
order_by_type=false

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ script:
1313
then
1414
py.test --doctest-modules --doctest-glob="*.rst" --ignore setup.py;
1515
else
16+
isort --recursive --diff wtforms_components tests && isort --recursive --check-only wtforms_components tests
17+
flake8 wtforms_components tests
1618
py.test;
1719
fi

intervals/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
Interval,
1111
IntervalFactory,
1212
IntInterval,
13-
NumberInterval,
13+
NumberInterval
1414
)
1515

16-
1716
__all__ = (
1817
'AbstractInterval',
1918
'CharacterInterval',

intervals/interval.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88

99
# -*- coding: utf-8 -*-
1010
import operator
11-
from datetime import datetime, date, timedelta
11+
from datetime import date, datetime, timedelta
1212
from decimal import Decimal
13-
from math import floor, ceil
13+
from math import ceil, floor
1414

1515
from infinity import inf, is_infinite
1616

17-
from .parser import IntervalParser, IntervalStringParser
1817
from .exc import IntervalException, RangeBoundsException
18+
from .parser import IntervalParser, IntervalStringParser
19+
1920
try:
2021
string_types = basestring, # Python 2
2122
except NameError:
@@ -43,6 +44,7 @@ def py2round(value):
4344
else:
4445
return float(ceil(float(value)-0.5))
4546

47+
4648
def canonicalize_lower(interval, inc=True):
4749
if not interval.lower_inc and inc:
4850
return interval.lower + interval.step, True

intervals/parser.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from .exc import IntervalException
2+
23
try:
34
string_types = basestring, # Python 2
45
except NameError:

setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ def get_version():
2424
extras_require = {
2525
'test': [
2626
'pytest>=2.2.3',
27-
'Pygments>=1.2'
27+
'Pygments>=1.2',
28+
'flake8>=2.4.0',
29+
'isort>=4.2.2',
2830
],
2931
}
3032

tests/interval/test_arithmetic.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from pytest import mark
2+
23
from intervals import IntInterval
34

45

tests/interval/test_canonicalize.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from datetime import date
2-
from intervals.interval import IntInterval, DateInterval, canonicalize
2+
3+
from intervals.interval import canonicalize, DateInterval, IntInterval
34

45

56
def test_canonicalize_integer_intervals():

tests/interval/test_coercion.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
from infinity import inf
12
from pytest import mark, raises
3+
24
from intervals import IntInterval
3-
from infinity import inf
45

56

67
@mark.parametrize(('interval', 'string'), (

tests/interval/test_initialization.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
from datetime import date
22
from decimal import Decimal
3-
from pytest import raises, mark
3+
4+
from infinity import inf
5+
from pytest import mark, raises
6+
47
from intervals import (
58
CharacterInterval,
69
DecimalInterval,
@@ -9,7 +12,6 @@
912
IntInterval,
1013
RangeBoundsException
1114
)
12-
from infinity import inf
1315

1416

1517
class TestIntervalInit(object):

tests/interval/test_operators.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from datetime import date
22

3-
from pytest import mark
43
from infinity import inf
4+
from pytest import mark
5+
56
from intervals import DateInterval, FloatInterval, IntInterval
67

78

@@ -18,7 +19,7 @@ class TestComparisonOperators(object):
1819
DateInterval([date(2011, 1, 1), date(2011, 1, 1)]),
1920
False
2021
),
21-
(IntInterval.from_string('(,)') == None, False)
22+
(IntInterval.from_string('(,)') == None, False) # noqa
2223
))
2324
def test_eq_operator(self, comparison, result):
2425
assert comparison is result
@@ -30,7 +31,7 @@ def test_eq_operator(self, comparison, result):
3031
(IntInterval([3, 3]) != 3, False),
3132
(IntInterval([3, 3]) != 5, True),
3233
(IntInterval([3, 3]) != 'something', True),
33-
(IntInterval.from_string('(,)') != None, True)
34+
(IntInterval.from_string('(,)') != None, True) # noqa
3435
))
3536
def test_ne_operator(self, comparison, result):
3637
assert comparison is result
@@ -113,7 +114,12 @@ def test_contains_operator_for_non_inclusive_interval(self, value):
113114
(IntInterval((0, 2)), IntInterval([0, 1]), False),
114115
(IntInterval((0, 2)), FloatInterval((0, 1)), False),
115116
))
116-
def test_hash_operator_with_interval_attributes(self, interval1, interval2, expected):
117+
def test_hash_operator_with_interval_attributes(
118+
self,
119+
interval1,
120+
interval2,
121+
expected
122+
):
117123
actual = (interval1.__hash__() == interval2.__hash__())
118124
assert actual == expected
119125

@@ -191,4 +197,3 @@ def test_and_operator_for_half_open_intervals_with_empty_results(
191197
IntInterval.from_string(interval1) &
192198
IntInterval.from_string(interval2)
193199
).empty == empty
194-

tests/interval/test_properties.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
from datetime import datetime, date
1+
from datetime import date, datetime
22
from decimal import Decimal
3+
4+
from infinity import inf
35
from pytest import mark
6+
47
from intervals import (
5-
IntInterval, FloatInterval, DateInterval, DateTimeInterval, DecimalInterval
8+
DateInterval,
9+
DateTimeInterval,
10+
DecimalInterval,
11+
FloatInterval,
12+
IntInterval
613
)
7-
from infinity import inf
814

915

1016
class TestIntervalProperties(object):

tests/interval/test_representations.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from pytest import mark
2+
23
from intervals import IntInterval
34

45

tests/interval/test_step.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from decimal import Decimal
2+
23
from intervals import DecimalInterval, FloatInterval, IntInterval
34

45

0 commit comments

Comments
 (0)