Merge branch 'dev' into beta

Drakkar-Software · Jun 2, 2018 · 9c1eb35 · 9c1eb35
2 parents 7f99022 + 893291f
commit 9c1eb35
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: enabled
 language: python
 python:
-  - 3.4
   - 3.5
   - 3.6
 

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
-envlist = py34, py35, py36
+envlist = py35, py36
 
 [travis]
 python =
     3.6: py36
     3.5: py35
-    3.4: py34
 
 [testenv]
 commands = pytest --cov=. --cov-config=.coveragerc --cov-report=term tests/