Some fixes. Update requirements.txt and setup.py.
This commit is contained in:
parent
ece772540f
commit
deb0d5b2e5
@ -3,7 +3,7 @@ python:
|
|||||||
- "2.6"
|
- "2.6"
|
||||||
- "2.7"
|
- "2.7"
|
||||||
install:
|
install:
|
||||||
- easy_install https://www.djangoproject.com/download/1.5b2/tarball/
|
- easy_install https://www.djangoproject.com/download/1.5c1/tarball/
|
||||||
- pip install -r requirements.txt --use-mirrors
|
- pip install -r requirements.txt --use-mirrors
|
||||||
- python extras/scripts/create_local_settings.py
|
- python extras/scripts/create_local_settings.py
|
||||||
script:
|
script:
|
||||||
|
@ -18,7 +18,11 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
|
|||||||
1. Check requirements:
|
1. Check requirements:
|
||||||
|
|
||||||
Make sure that you have installed Python Programming Language 2
|
Make sure that you have installed Python Programming Language 2
|
||||||
(>= 2.6) on your system.
|
(>= 2.6) on your system. You will also need the Python
|
||||||
|
development headers.
|
||||||
|
|
||||||
|
E. g. for Ubuntu run:
|
||||||
|
$ sudo apt-get install python-dev
|
||||||
|
|
||||||
2. Setup a virtual environment with virtualenv (optional):
|
2. Setup a virtual environment with virtualenv (optional):
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ class CreateView(PermissionMixin, _CreateView):
|
|||||||
return self.apply_url
|
return self.apply_url
|
||||||
else:
|
else:
|
||||||
raise ImproperlyConfigured(
|
raise ImproperlyConfigured(
|
||||||
"No URL to redirect to. Provide a apply_url.")
|
'No URL to redirect to. Please provide an apply_url.')
|
||||||
|
|
||||||
def form_invalid(self, form):
|
def form_invalid(self, form):
|
||||||
messages.error(self.request, _('Please check the form for errors.'))
|
messages.error(self.request, _('Please check the form for errors.'))
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Django==1.5b2
|
Django==1.5
|
||||||
django-mptt==0.5.5
|
django-mptt==0.5.5
|
||||||
reportlab==2.6
|
reportlab==2.6
|
||||||
PIL==1.1.7
|
PIL==1.1.7
|
||||||
coverage==3.6b1
|
coverage==3.6b3
|
||||||
django-discover-runner==0.2.2
|
django-discover-runner==0.2.2
|
||||||
pep8==1.3.3
|
pep8==1.4
|
||||||
|
5
setup.py
5
setup.py
@ -7,9 +7,6 @@
|
|||||||
:license: GNU GPL, see LICENSE for more details.
|
:license: GNU GPL, see LICENSE for more details.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# for python 2.5 support
|
|
||||||
from __future__ import with_statement
|
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
from setuptools import find_packages
|
from setuptools import find_packages
|
||||||
from openslides import get_version
|
from openslides import get_version
|
||||||
@ -43,7 +40,7 @@ setup(
|
|||||||
'versiontools >= 1.6',
|
'versiontools >= 1.6',
|
||||||
],
|
],
|
||||||
install_requires=[
|
install_requires=[
|
||||||
'django >= 1.4',
|
'django >= 1.5',
|
||||||
'django-mptt',
|
'django-mptt',
|
||||||
'reportlab',
|
'reportlab',
|
||||||
'pil',
|
'pil',
|
||||||
|
Loading…
Reference in New Issue
Block a user