ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2232 from emanuelschuetze/fix-travis

Browse Source 
Fix travis: upgrade setuptools before install
This commit is contained in:
Emanuel Schütze 2016-07-27 14:09:18 +02:00 committed by GitHub
commit 152943fe93
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -9,6 +9,7 @@ python:
- "3.4" - "3.4"
- "3.5" - "3.5"
install: install:
- "pip install --upgrade setuptools"
- "pip install --upgrade --requirement requirements.txt" - "pip install --upgrade --requirement requirements.txt"
- "npm install" - "npm install"
- "node_modules/.bin/gulp --production" - "node_modules/.bin/gulp --production"

4
requirements_production.txt
View File

@ -1,6 +1,6 @@
# Requirements for OpenSlides in production in alphabetical order # Requirements for OpenSlides in production in alphabetical order
Django>=1.8,<1.10 Django>=1.8,<1.10
beautifulsoup4>=4.4,<4.5 beautifulsoup4>=4.5,<4.6
channels>=0.15,<1.0 channels>=0.15,<1.0
djangorestframework>=3.2.0,<3.4.0 djangorestframework>=3.2.0,<3.4.0
html5lib>=0.9,<1.0 html5lib>=0.9,<1.0
@ -9,6 +9,6 @@ natsort>=3.2,<4.1
PyPDF2>=1.25.0,<1.26 PyPDF2>=1.25.0,<1.26
reportlab>=3.0,<3.4 reportlab>=3.0,<3.4
roman>=2.0,<2.1 roman>=2.0,<2.1
setuptools>=2.2,<21.0 setuptools>=18.5,<26.0
sockjs-tornado>=1.0.1,<1.1 sockjs-tornado>=1.0.1,<1.1
Whoosh>=2.7.0,<2.8 Whoosh>=2.7.0,<2.8