Skip to content

Commit cfc4564

Browse files
committedAug 13, 2019
Remove extra_attributes, breaking on Python 2.
1 parent ec66f35 commit cfc4564

File tree

3 files changed

+31
-7
lines changed

3 files changed

+31
-7
lines changed
 

‎.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ before_install:
4848
- export EASY_SETUP_URL='http://peak.telecommunity.com/dist/ez_setup.py'
4949

5050
install:
51-
- pip install --upgrade tox coveralls
51+
- pip install --upgrade pip tox coveralls
52+
- python --version
53+
- pip --version
5254

5355
script:
5456
- tox -e $TOX_ENV

‎setup.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ def read(fname):
2525
if fh:
2626
fh.close()
2727

28-
extra_attributes = {}
29-
# if sys.version_info >= (3,):
30-
# extra_attributes['use_2to3'] = True
31-
3228
params = dict(
3329
name="PyHamcrest",
3430
version=__version__, # flake8:noqa
@@ -64,8 +60,7 @@ def read(fname):
6460
"Topic :: Software Development :: Quality Assurance",
6561
"Topic :: Software Development :: Testing",
6662
],
67-
**extra_attributes,
6863
)
6964

70-
all_params = dict(params.items(), **extra_attributes)
65+
all_params = dict(params.items())
7166
setup(**all_params)

‎tox.ini

+27
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,30 @@ include_trailing_comma=True
5656
force_grid_wrap=0
5757
use_parentheses=True
5858
line_length=100
59+
60+
[testenv:flake8]
61+
basepython = python3
62+
skip_install = true
63+
deps =
64+
flake8~=3.0
65+
flake8-bugbear~=18.0
66+
flake8-comprehensions~=1.0
67+
flake8-mutable~=1.0
68+
mccabe~=0.6
69+
flake8-blind-except~=0.1
70+
flake8-builtins~=1.0
71+
flake8-pep3101~=1.0
72+
flake8-print~=3.0
73+
flake8-string-format~=0.2
74+
flake8-logging-format~=0.5
75+
76+
commands =
77+
flake8 src/ tests/ setup.py
78+
79+
[flake8]
80+
max-complexity = 5
81+
max-line-length = 100
82+
show-source = True
83+
enable-extensions = M,B,C,T,P
84+
ignore = C812,W503,P103,E1,E2,E3,E5
85+
statistics = True

0 commit comments

Comments
 (0)
Please sign in to comment.