Skip to content

Commit

Permalink
Pin and update requirements (#18)
Browse files Browse the repository at this point in the history
* Pin and update all requirements

* Fix lint issues

* Pin pylint to 1.9.3 to support Python 2

* Clean up
  • Loading branch information
MartinHjelmare authored Dec 8, 2018
1 parent af09d1c commit c1dfd04
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions leicacam/cam.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def debug(msg):
"""Debug on Windows."""
try:
dbg = os.environ['DEBUG']
if dbg == 'leicacam' or dbg == '*':
if dbg in ('leicacam', '*'):
print('leicacam ' + str(msg))
except KeyError:
pass
Expand Down Expand Up @@ -508,6 +508,6 @@ def check_messages(msgs, cmd, value=None):
for msg in msgs:
if value and msg.get(cmd) == value:
return msg
elif not value and msg.get(cmd):
if not value and msg.get(cmd):
return msg
return None
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
-r requirements_pypi.txt
-r requirements_test.txt
-r docs/requirements.txt
tox
tox==3.5.3

-e .
12 changes: 6 additions & 6 deletions requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
flake8==3.5.0
mock>=2.0.0
pydocstyle==2.1.1
pylint==1.8.3
pytest==3.5.0
pytest-cov>=2.5.1
flake8==3.6.0
mock==2.0.0
pydocstyle==3.0.0
pylint==1.9.3
pytest==4.0.1
pytest-cov==2.6.0
2 changes: 1 addition & 1 deletion test/test_cam.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from leicacam.cam import CAM, bytes_as_dict, tuples_as_bytes, tuples_as_dict

# pylint: disable=redefined-outer-name
# pylint: disable=redefined-outer-name, unnecessary-pass,


def flush():
Expand Down

0 comments on commit c1dfd04

Please sign in to comment.