Merge branch 'develop' into v3-revisited

This commit is contained in:
Micah Lee 2018-11-18 17:04:20 -08:00
commit e29c0e7b69
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
84 changed files with 1859 additions and 3805 deletions

View file

@ -1,11 +1,10 @@
atomicwrites==1.2.1
attrs==18.2.0
more-itertools==4.3.0
pluggy==0.6.0
py==1.6.0
pytest==3.4.2
pluggy==0.7.1
py==1.7.0
pytest==3.8.2
pytest-faulthandler==1.5.0
pytest-ordering==0.5
pytest-qt==3.1.0
pytest-qt==3.2.1
six==1.11.0
urllib3==1.23