Merge branch 'master' of github.com:MISP/PyMISP

.travis.yml

@@ -20,7 +20,7 @@ install:
     - pip install -U nose
     - pip install coveralls
     - pip install codecov
-    - pip install requests-mock pytest
+    - pip install requests-mock
     - pip install https://github.com/lief-project/packages/raw/lief-master-latest/pylief-0.7.0.dev.zip
     - pip install git+https://github.com/kbandla/pydeep.git
     - pip install python-magic

setup.py

@@ -26,8 +26,15 @@ setup(
         'Topic :: Security',
         'Topic :: Internet',
     ],
-    test_suite="tests",
+    test_suite="tests.test_offline",
     install_requires=['six', 'requests', 'python-dateutil', 'jsonschema'],
+    tests_require=[
+        'jsonschema',
+        'python-dateutil',
+        'python-magic',
+        'requests-mock',
+        'six'
+    ],
     include_package_data=True,
     package_data={'pymisp': ['data/*.json', 'data/misp-objects/schema_objects.json',
                              'data/misp-objects/schema_relationships.json',

tests/test_offline.py

@@ -233,9 +233,12 @@ class TestOffline(unittest.TestCase):
 
     def test_objects(self, m):
         paths = ['cmd.exe', 'tmux', 'MachO-OSX-x64-ls']
-        for path in paths:
-            json_blob = self.make_objects(os.path.join('tests',
-                                          'viper-test-files', 'test_files', path))
+        try:
+            for path in paths:
+                json_blob = self.make_objects(os.path.join('tests',
+                                              'viper-test-files', 'test_files', path))
+        except IOError:  # Can be replaced with FileNotFoundError when support for python 2 is dropped
+            return unittest.SkipTest()
         print(json_blob)
 
 if __name__ == '__main__':