py3.4 does not support marshmallow 3

mplanchard · Sep 6, 2019 · 6bbf5ee · 6bbf5ee
1 parent be6062d
commit 6bbf5ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -10,19 +10,26 @@ test-2.7:
     - pip install tox
     - tox -e py27
 
-test-3.4-marshmallow-2:
+test-3.4:
   image: python:3.4
   stage: test
   script:
     - pip install tox
-    - tox -e py34-marshmallow2
+    - tox -e py34
 
-test-3.4-marshmallow-3:
-  image: python:3.4
+test-3.5-marshmallow-2:
+  image: python:3.5
+  stage: test
+  script:
+    - pip install tox
+    - tox -e py35-marshmallow2
+
+test-3.5-marshmallow-3:
+  image: python:3.5
   stage: test
   script:
     - pip install tox
-    - tox -e py34-marshmallow3
+    - tox -e py35-marshmallow3
 
 test-3.6-marshmallow-2:
   image: python:3.6

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, {py34,py36,py37}-marshmallow{2,3}
+envlist = py27, py34, {py35,py36,py37}-marshmallow{2,3}
 
 [testenv]
 deps =