From e3dcb6a93c7f6b5399ec2c78665f4b7a0804257f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 22 Sep 2015 16:40:35 +0200 Subject: [PATCH 1/4] Add coveralls --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44994e345..f556303f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ addons: install: - pip install --user pyzmq + - pip install --user coveralls - pip install --user git+https://github.com/CybOXProject/python-cybox.git@v2.1.0.12#egg=Package - pip install --user git+https://github.com/stixproject/python-stix.git@v1.2.0.0#egg=Package - pip install --user git+https://github.com/MISP/PyMISP.git#egg=Package @@ -90,7 +91,7 @@ before_script: script: - pushd PyMISP - - python setup.py test - - popd - #- cat app/tmp/logs/error.log - #- cat app/tmp/logs/debug.log + - coverage run setup.py test + +after_success: + - coveralls From fe875c27bae04ecd7d9944df948ad8f3fb01660a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 22 Sep 2015 17:05:28 +0200 Subject: [PATCH 2/4] Add pymisp as a submodule --- .gitmodules | 3 +++ .travis.yml | 1 - PyMISP | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 160000 PyMISP diff --git a/.gitmodules b/.gitmodules index 2e7397c6f..f13adb6e8 100755 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = app/Lib/cakephp url = https://github.com/cakephp/cakephp.git branch = 2.6 +[submodule "PyMISP"] + path = PyMISP + url = https://github.com/MISP/PyMISP.git diff --git a/.travis.yml b/.travis.yml index f556303f0..0018bcfa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,6 @@ before_script: - mysql -u root -e "grant usage on *.* to misp@localhost identified by 'blah'"; - mysql -u root -e "grant all privileges on misp.* to misp@localhost;" - mysql -u misp -pblah misp < INSTALL/MYSQL.sql - - git clone https://github.com/MISP/PyMISP.git - AUTH=`app/Console/cake userInit -q` - sudo chown -R www-data:www-data app/ - curl http://misp.local >> /dev/null diff --git a/PyMISP b/PyMISP new file mode 160000 index 000000000..81fa4e5bd --- /dev/null +++ b/PyMISP @@ -0,0 +1 @@ +Subproject commit 81fa4e5bdda9776e96cafa3b1b4972085a09767b From 84b414e284b60259de166a6b73530f8ebe003788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 22 Sep 2015 17:18:17 +0200 Subject: [PATCH 3/4] add codecov --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0018bcfa9..1f3ac974d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ addons: install: - pip install --user pyzmq - pip install --user coveralls + - pip install --user codecov - pip install --user git+https://github.com/CybOXProject/python-cybox.git@v2.1.0.12#egg=Package - pip install --user git+https://github.com/stixproject/python-stix.git@v1.2.0.0#egg=Package - pip install --user git+https://github.com/MISP/PyMISP.git#egg=Package @@ -94,3 +95,4 @@ script: after_success: - coveralls + - codecov From b2876c69592544f292585ef64447d50b3e277e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 22 Sep 2015 17:36:41 +0200 Subject: [PATCH 4/4] Update default version for cakephp, make sure PyMISP follows master --- .gitmodules | 1 + app/Lib/cakephp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f13adb6e8..6bfef68b8 100755 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,4 @@ [submodule "PyMISP"] path = PyMISP url = https://github.com/MISP/PyMISP.git + branch = master diff --git a/app/Lib/cakephp b/app/Lib/cakephp index 4c61b579c..3e0b6cc28 160000 --- a/app/Lib/cakephp +++ b/app/Lib/cakephp @@ -1 +1 @@ -Subproject commit 4c61b579c40863ada019e1e08c6195ae612c589f +Subproject commit 3e0b6cc285e283b7f097b9ecf4898ba3b92b477d