Merge branch 'master' into 'devel'

# Conflicts:
#   ivatar/middleware.py
This commit is contained in:
Oliver Falk
2018-11-19 16:25:01 +01:00

View File

@@ -2,9 +2,10 @@ image: centos:centos7
before_script:
- yum install -y -t https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
- yum -y -t install python34 python34-pip python34-devel unzip mysql-devel gcc git openldap-devel
- pip3 install virtualenv --upgrade
- virtualenv -p python3 /tmp/.virtualenv
- yum -y -t install python36 python34-pip python36-devel unzip mysql-devel gcc git openldap-devel
- pip3 install pip --upgrade
- pip install virtualenv --upgrade
- virtualenv -p python3.6 /tmp/.virtualenv
- source /tmp/.virtualenv/bin/activate
- pip install -r requirements.txt
- pip install python-coveralls