MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5668/head
iglocska 2020-02-26 16:14:57 +01:00
parent 08e0e9d16d 87eaf94b68
commit 6c0aeab4bd
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -27,11 +27,11 @@ install:
- sudo apt-get -y update
# Travis lacks entropy.
- sudo apt-get -y install haveged
- sudo apt-get -y install python3 python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-redis php-gnupg php-gd
- sudo apt-get -y install python3 python3-venv python3-pip python3-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php libfuzzy-dev php-mbstring libonig4 php-json php-xml php-opcache php-readline php-redis php-gnupg php-gd
- sudo apt-get -y dist-upgrade
- sudo pip3 install --upgrade pip setuptools requests pyzmq
- sudo pip3 install --upgrade -r requirements.txt
- sudo pip3 install pipenv
- sudo pip3 install poetry
- phpenv rehash
- sudo mkdir $HOME/.composer ; sudo chown $USER:www-data $HOME/.composer
- pushd app
@ -151,13 +151,13 @@ script:
- pushd PyMISP
- git submodule init
- git submodule update
- pipenv install -d
- pipenv run python tests/testlive_comprehensive.py
- pipenv run python tests/test_mispevent.py
- poetry install -E fileobjects -E openioc -E virustotal -E docs -E pdfexport
- poetry run nosetests-3.4 tests/testlive_comprehensive.py
- poetry run nosetests-3.4 tests/test_mispevent.py
- popd
- cp PyMISP/tests/keys.py PyMISP/examples/events/
- pushd PyMISP/examples/events/
- pipenv run python ./create_massive_dummy_events.py -l 5 -a 30
- poetry run python ./create_massive_dummy_events.py -l 5 -a 30
- popd
- pushd app/files/feed-metadata
- jsonschema -i defaults.json schema.json

2
PyMISP

@ -1 +1 @@
Subproject commit d6888b5fc97bc7fef35c5a2c41229a4d4a294052
Subproject commit 7d60cbd9c96d8274e1b49527d05b418965df6ec5

4
db_schema.json
View File

@ -5718,5 +5718,5 @@
"id"
]
},
"db_version": "47"
}
"db_version": "48"
}