Changed installation requirements to force PyYAML 3.13 on Python 3.7 …

…and updated test environments to reflect this change. Closes #26.
insightindustry · Nov 27, 2018 · 58dec6e · 58dec6e
1 parent 6523b81
commit 58dec6e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -342,98 +342,93 @@ matrix:
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson30
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson30
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson31
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson31
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson32
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson32
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson33
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson33
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson34
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson34
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson35
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson35
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson36
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson36
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson37
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson37
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson38
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson38
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson39
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson39
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson310
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson310
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson311
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson311
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson312
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson312
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson313
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson313
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson314
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson314
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson315
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson315
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml310-simplejson316
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson316
 # PYYAML
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml311-simplejson316
-    - python: '3.7'
-      dist: xenial
-      sudo: true
-      env:
-        - TOXENV=.python37-sqlalchemy09-pyyaml312-simplejson316
+        - TOXENV=.python37-sqlalchemy09-pyyaml313-simplejson316
     - python: '3.7'
       dist: xenial
       sudo: true
@@ -444,7 +439,7 @@ matrix:
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy10-pyyaml312-simplejson316
+        - TOXENV=.python37-sqlalchemy10-pyyaml313-simplejson316
     - python: '3.7'
       dist: xenial
       sudo: true
@@ -454,12 +449,12 @@ matrix:
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy11-pyyaml312-simplejson316
+        - TOXENV=.python37-sqlalchemy11-pyyaml313-simplejson316
     - python: '3.7'
       dist: xenial
       sudo: true
       env:
-        - TOXENV=.python37-sqlalchemy12-pyyaml312-simplejson316
+        - TOXENV=.python37-sqlalchemy12-pyyaml313-simplejson316
     - python: '3.7'
       dist: xenial
       sudo: true

diff --git a/setup.py b/setup.py
@@ -150,7 +150,8 @@
         'sqlalchemy>=0.9',
         'validator-collection>=1.2.0',
         'simplejson>=3.0',
-        'PyYAML>=3.10',
+        'PyYAML>=3.10;python_version<"3.7"',
+        'PyYAML>=3.13;python_version>"3.6"'
     ],
 
     # List additional groups of dependencies here (e.g. development

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs,coverage,.python{27,30,31,32,33,34,35,36,37}-sqlalchemy{09,10,11,12}-pyyaml{310,311,312,42b1,42b2}-simplejson{30,31,32,33,34,35,36,37,38,39,310,311,312,313,314,315,316}
+envlist = docs,coverage,.python{27,30,31,32,33,34,35,36,37}-sqlalchemy{09,10,11,12}-pyyaml{310,311,312,313,42b1,42b2}-simplejson{30,31,32,33,34,35,36,37,38,39,310,311,312,313,314,315,316}
 
 [testenv]
 usedevelop = True
@@ -20,6 +20,7 @@ deps =
     pyyaml310: PyYAML==3.10
     pyyaml311: PyYAML==3.11
     pyyaml312: PyYAML==3.12
+    pyyaml313: PyYAML==3.13
     pyyaml42b1: PyYAML==4.2b1
     pyyaml42b2: PyYAML==4.2b2
     simplejson30: simplejson>=3.0,<3.1