Merge pull request #13232 from cpennington/upgrade-flaky

Upgrade the flaky library, so that py.test (used by oep2 reporting) w…

requirements/edx/base.txt

@@ -150,7 +150,7 @@ diff-cover==0.9.8
 django-crum==0.5
 django_nose==1.4.1
 factory_boy==2.5.1
-flaky==2.4.0
+flaky==3.3.0
 freezegun==0.1.11
 mock-django==0.6.9
 mock==1.0.1