From 76439d1ce9eedd5f567df3d10cf081cf051f4e78 Mon Sep 17 00:00:00 2001 From: Chris Lenk Date: Wed, 8 Jan 2020 13:22:08 -0500 Subject: [PATCH] Redo pyyaml workaround for travis --- .travis.yml | 7 +++---- tox.ini | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08214fe..018aefe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,11 @@ python: - "3.8" install: - pip install -U pip setuptools - # remove pyyaml line when we drop py3.4 support - - pip install "pyyaml<5.3" - - pip install tox-travis pre-commit + - pip install tox-travis - pip install codecov + - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pip install pre-commit; fi script: - tox - - pre-commit run --all-files + - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pre-commit run --all-files; fi after_success: - codecov diff --git a/tox.ini b/tox.ini index 1f47ca8..d34aac1 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ deps = haversine python-Levenshtein medallion - pyyaml<5.3 commands = python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning