Commit 93c69277 authored by Jason R. Coombs's avatar Jason R. Coombs

Maybe just the pin needs to be removed

parent 9e36a563
...@@ -12,7 +12,7 @@ env: ...@@ -12,7 +12,7 @@ env:
- LC_ALL=C LC_CTYPE=C - LC_ALL=C LC_CTYPE=C
script: script:
# avoid VersionConflict when newer version is required # 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 # Output the env, because the travis docs just can't be trusted
- env - env
......
...@@ -12,6 +12,5 @@ install: ...@@ -12,6 +12,5 @@ install:
build: off build: off
test_script: test_script:
- "python -m pip install -U flake8"
- "python bootstrap.py" - "python bootstrap.py"
- "python setup.py test" - "python setup.py test"
...@@ -181,8 +181,6 @@ setup_params = dict( ...@@ -181,8 +181,6 @@ setup_params = dict(
tests_require=[ tests_require=[
'setuptools[ssl]', 'setuptools[ssl]',
'pytest-flake8', 'pytest-flake8',
# workaround for pytest-flake8 #7
'flake8<3dev',
'pytest>=2.8', 'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []), ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[ setup_requires=[
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment