Merge branch 'master' of github.com:oasis-open/cti-python-stix2

.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

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