diff --git a/.travis.yml b/.travis.yml index fc6e793..3978062 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,11 +47,9 @@ install: - unzip pdfid_v0_2_1.zip - pip install -U pip - pip install lxml exifread pillow + - pip install olefile + - pip install git+https://github.com/decalage2/oletools.git - pip install git+https://github.com/Rafiot/officedissector.git - - | - if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then - pip install -U oletools olefile - fi # Module dependencies - pip install -r dev-requirements.txt - pip install coveralls codecov diff --git a/tests/test_examples.py b/tests/test_examples.py index 79d9efb..38d6784 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -9,9 +9,7 @@ import pytest from bin.specific import KittenGroomerSpec from bin.pier9 import KittenGroomerPier9 from bin.generic import KittenGroomer - -if sys.version_info.major == 2: - from bin.filecheck import KittenGroomerFileCheck +from bin.filecheck import KittenGroomerFileCheck skip = pytest.mark.skip @@ -64,14 +62,12 @@ def test_generic_2(src_complex, dst): dump_logs(spec) -@py2_only def test_filecheck(src_complex, dst): spec = KittenGroomerFileCheck(src_complex, dst, debug=True) spec.processdir() dump_logs(spec) -@py2_only def test_filecheck_2(src_simple, dst): spec = KittenGroomerFileCheck(src_simple, dst, debug=True) spec.processdir()