Merge branch 'master' into docstructure

# Conflicts:
#	setup.py

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index e349167d..b59d72ff 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ EXTRAS_REQUIRE = {
              'codecov', 'pytest', 'pytest-cov', 'pytest-mock'],
     # development only dependencies:  install with 'pip install -e .[dev]'
     'dev': ["mock ; python_version<'3.6'",  # for python 3.5 we need the third party mock module
-            'pytest', 'codecov', 'pytest-cov', 'pytest-mock', 'tox', 'pylint',
+            'pytest', 'codecov', 'pytest-cov', 'pytest-mock', 'tox', 'flake8',
             'sphinx', 'sphinx-rtd-theme', 'sphinx-autobuild', 'doc8',
             'invoke', 'twine>=1.11',
             ]