Merge branch 'test-3' into esi

# Conflicts: # requirements.txt
2018-02-11 23:17:50 -05:00
parent 7b0f672f04 5f0ce58c29
commit 33eccaa374
18 changed files with 109 additions and 112 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
-wxPython >= 4.0.0b2
+wxPython >= 4.0.1
 logbook >= 1.0.0
 matplotlib >= 2.0.0
 python-dateutil
-urllib3
-requests == 2.0.0
-sqlalchemy == 1.0.5
-esipy == 0.3.0
+requests >= 2.0.0
+sqlalchemy >= 1.0.5
+esipy == 0.3.0
+markdown2
+packaging