Merge branch 'graph_fix'

2019-07-30 08:44:40 +03:00
parent 43ba63233d 4d2bb5ba87
commit fae3e8568a
3 changed files with 5 additions and 4 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
-wxPython == 4.0.4
+wxPython == 4.0.6
 logbook >= 1.0.0
-matplotlib >= 2.0.0
+matplotlib == 3.0.3
+numpy==1.16.4
 python-dateutil
 requests >= 2.0.0
 sqlalchemy >= 1.3.0
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ passenv = CI TRAVIS TRAVIS_*
 deps =
    -rrequirements.txt
    -rrequirements_test.txt
-basepython = python3.6
+basepython = python3.7
 commands = py.test -vv --cov Pyfa tests2/

 [testenv:pep8]
--- a/version.yml
+++ b/version.yml
@@ -1 +1 @@
-version: v2.9.4
+version: v2.9.6