From e980e20042ee2d9a1088b1fa6fc0497e166e74dd Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 27 Jul 2016 11:03:40 +0200 Subject: [PATCH] Fix travis: Upgrade setuptools before install. Upgrade setuptools to 18.5+. Upgrade beautifulsoup4 to 4.5+ to work with latest html5lib. --- .travis.yml | 1 + requirements_production.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5761543b6..808889cb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ python: - "3.4" - "3.5" install: + - "pip install --upgrade setuptools" - "pip install --upgrade --requirement requirements.txt" - "npm install" - "node_modules/.bin/gulp --production" diff --git a/requirements_production.txt b/requirements_production.txt index e37692a30..9a9ab3bbb 100644 --- a/requirements_production.txt +++ b/requirements_production.txt @@ -1,6 +1,6 @@ # Requirements for OpenSlides in production in alphabetical order Django>=1.8,<1.10 -beautifulsoup4>=4.4,<4.5 +beautifulsoup4>=4.5,<4.6 channels>=0.15,<1.0 djangorestframework>=3.2.0,<3.4.0 html5lib>=0.9,<1.0 @@ -9,6 +9,6 @@ natsort>=3.2,<4.1 PyPDF2>=1.25.0,<1.26 reportlab>=3.0,<3.4 roman>=2.0,<2.1 -setuptools>=2.2,<21.0 +setuptools>=18.5,<26.0 sockjs-tornado>=1.0.1,<1.1 Whoosh>=2.7.0,<2.8