Merge pull request sigmavirus24#744 from omgjlk/fix-flakes

sigmavirus24 · web-flow · commit 6dcfd1dd8423 · 2017-12-14T19:25:48.000-06:00
Fix flake8 issues
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,7 +1,7 @@
 .
 #coverage==3.5.2
 mock==1.0.1
-pytest>=2.3.5
+pytest>=2.3.5,<3.3.0
 wheel==0.21.0
 betamax>=0.5.0
 betamax_matchers>=0.2.0
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     'pyasn1'
 ]
 
-kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest',
+kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest <3.3.0',
                            'betamax-matchers>=0.1.0']
 if sys.version_info < (3, 0):
     kwargs['tests_require'].append('unittest2 ==0.5.1')
diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,7 @@ pip_pre = False
 deps =
     requests{env:REQUESTS_VERSION:>=2.0}
     mock==1.0.1
-    pytest>=2.3.5
+    pytest>=2.3.5,<3.3.0
     betamax>=0.5.1
     betamax_matchers>=0.3.0
     pypy,py27: unittest2

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`'pyasn1'`
`24`	`24`	`]`
`25`	`25`
`26`		`-kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest',`
	`26`	`+kwargs['tests_require'] = ['betamax >=0.2.0', 'pytest <3.3.0',`
`27`	`27`	`'betamax-matchers>=0.1.0']`
`28`	`28`	`if sys.version_info < (3, 0):`
`29`	`29`	`kwargs['tests_require'].append('unittest2 ==0.5.1')`