From 59d1f1c817cd37c78c6cae65ca61cf076d9527a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 25 Jan 2019 10:43:02 +0100
Subject: [PATCH] chg: Pump PyMISP, use pipenv in travis

---
 .travis.yml      | 15 +++++++--------
 PyMISP           |  2 +-
 requirements.txt |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 073d3f01a..c5628f462 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ install:
     - sudo pip3.6 install --upgrade pip setuptools requests
     - hash -r
     - sudo pip3.6 install --upgrade -r requirements.txt
+    - sudo pip3.6 install pipenv
     - phpenv rehash
     - pushd app
     - composer install
@@ -111,20 +112,18 @@ script:
     - ./curl_tests.sh $AUTH
     - popd
     - pushd PyMISP
-    - sudo pip3.6 install nose python-dateutil
-    - sudo pip3.6 install git+https://github.com/kbandla/pydeep.git
-    - sudo pip3.6 install -e .[fileobjects,neo,openioc,virustotal]
+    - pipenv install -d
     - pushd tests
     - git clone https://github.com/viper-framework/viper-test-files.git
     - popd
-    - python3.6 tests/test.py
-    - python3.6 tests/test_mispevent.py
-    - python3.6 tests/test_offline.py
-    - python3.6 tests/testlive_comprehensive.py
+    - pipenv run python tests/test.py
+    - pipenv run python tests/test_mispevent.py
+    - pipenv run python tests/test_offline.py
+    - pipenv run python tests/testlive_comprehensive.py
     - popd
     - cp PyMISP/tests/keys.py PyMISP/examples/events/
     - pushd PyMISP/examples/events/
-    - python3.6 ./create_massive_dummy_events.py -l 5 -a 30
+    - pipenv run python ./create_massive_dummy_events.py -l 5 -a 30
     - popd
     - pushd app/files/feed-metadata
     - jsonschema -i defaults.json schema.json
diff --git a/PyMISP b/PyMISP
index f5e621b2a..1ec357cd7 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit f5e621b2a52ee8ab6b0860e4b7d09169be5e1d69
+Subproject commit 1ec357cd7468060cf35f9615dc0857bbaf8c1c46
diff --git a/requirements.txt b/requirements.txt
index 71d1f579f..11d167be3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ pyzmq
 coveralls
 codecov
 stix == 1.2.0.6
-git+https://github.com/MISP/PyMISP.git#egg=Package
+git+https://github.com/MISP/PyMISP.git#egg=pymisp
 requests-mock
 pip
 nose