Update travis file, use composer for all PHP deps.

pull/2340/head
Raphaël Vinot 2017-07-17 11:11:38 +02:00
parent b292d81336
commit 8801dd0648
2 changed files with 17 additions and 17 deletions

View File

@ -3,20 +3,19 @@ language: php
php:
- 5.6
- 7.0
- 7.1
- nightly
services:
- redis
- mysql
sudo: required
dist: trusty
group: edge
env:
- DB=mysql
addons:
mariadb:
- '10.0'
hosts:
- misp.local
- localhost
@ -26,14 +25,13 @@ addons:
- python3-pip
- libxml2-dev
- zlib1g-dev
- php5-dev
- php5-cli
- apache2
- libapache2-mod-php5
- curl
- php5-mysql
- php5-dev
- php5-cli
- libapache2-mod-php5
cache: pip
before_install:
- git config --global user.name "TravisCI"
@ -48,8 +46,6 @@ install:
- pip3 install --user git+https://github.com/CybOXProject/python-cybox.git@v2.1.0.12#egg=Package
- pip3 install --user git+https://github.com/stixproject/python-stix.git@v1.2.0.0#egg=Package
- pip3 install --user git+https://github.com/MISP/PyMISP.git#egg=Package
- pear install Crypt_GPG
- pear install Net_GeoIP
- phpenv rehash
- pushd app
- composer install
@ -124,11 +120,11 @@ script:
- ./curl_tests.sh $AUTH
- popd
- pushd PyMISP
- pip3 install -U nose
- pip3 install coveralls
- pip3 install codecov
- pip3 install requests-mock
- pip3 install .
- pip3 install --user -U nose
- pip3 install --user coveralls
- pip3 install --user codecov
- pip3 install --user requests-mock
- pip3 install --user .
- nosetests --with-coverage --cover-package=pymisp tests/test_offline.py
- python3 tests/test.py
- popd
@ -160,4 +156,4 @@ after_success:
- coveralls
- coverage report
- coverage xml
- codecov -d
- codecov

View File

@ -1,6 +1,10 @@
{
"prefer-stable": true,
"minimum-stability": "dev",
"require": {
"kamisama/cake-resque": ">=4.1.2"
"kamisama/cake-resque": "@stable",
"pear/crypt_gpg": "@stable",
"pear/net_geoip": "@dev"
}
}