summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml1
-rwxr-xr-xsetup.py2
3 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index e275605b..e91f7e78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
- LC_ALL=C LC_CTYPE=C
script:
# avoid VersionConflict when newer version is required
- - pip install -U pytest flake8
+ - pip install -U pytest
# Output the env, because the travis docs just can't be trusted
- env
diff --git a/appveyor.yml b/appveyor.yml
index 14456813..4ae6c791 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,6 +12,5 @@ install:
build: off
test_script:
- - "python -m pip install -U flake8"
- "python bootstrap.py"
- "python setup.py test"
diff --git a/setup.py b/setup.py
index be86c29c..0cf1d0b2 100755
--- a/setup.py
+++ b/setup.py
@@ -181,8 +181,6 @@ setup_params = dict(
tests_require=[
'setuptools[ssl]',
'pytest-flake8',
- # workaround for pytest-flake8 #7
- 'flake8<3dev',
'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[