MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #319 from oasis-open/fix-travis-pyyaml 

Redo pyyaml workaround for travis
master
Chris Lenk 2020-01-08 13:37:03 -05:00 committed by GitHub
parent 8140258d81 76439d1ce9
commit b17ac3ba30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -11,12 +11,11 @@ python:
- "3.8" - "3.8"
install: install:
- pip install -U pip setuptools - pip install -U pip setuptools
# remove pyyaml line when we drop py3.4 support - pip install tox-travis
- pip install "pyyaml<5.3"
- pip install tox-travis pre-commit
- pip install codecov - pip install codecov
- if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pip install pre-commit; fi
script: script:
- tox - tox
- pre-commit run --all-files - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pre-commit run --all-files; fi
after_success: after_success:
- codecov - codecov

1
tox.ini
View File

@ -13,7 +13,6 @@ deps =
haversine haversine
python-Levenshtein python-Levenshtein
medallion medallion
pyyaml<5.3
commands = commands =
python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning