nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

call django.setup before syncdb for django 1.7 compatibility

Browse Source
This commit is contained in:
fonfon 2014-10-01 16:42:09 +02:00
parent b157c474fe
commit ea982bf73e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -4,7 +4,7 @@
On a Debian based system, run: On a Debian based system, run:
$ sudo apt-get install libjs-jquery libjs-modernizer \ $ sudo apt-get install libjs-jquery libjs-modernizr \
libjs-twitter-bootstrap make pandoc python3 python3-cherrypy3 \ libjs-twitter-bootstrap make pandoc python3 python3-cherrypy3 \
python3-django python3-bootstrapform python3-django python3-bootstrapform

1
plinth/__main__.py
View File

@ -195,6 +195,7 @@ def configure_django():
STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'), STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'),
TEMPLATE_CONTEXT_PROCESSORS=context_processors, TEMPLATE_CONTEXT_PROCESSORS=context_processors,
TEMPLATE_DIRS=template_directories) TEMPLATE_DIRS=template_directories)
django.setup()
LOGGER.info('Configured Django') LOGGER.info('Configured Django')
LOGGER.info('Template directories - %s', template_directories) LOGGER.info('Template directories - %s', template_directories)

2
setup.py
View File

@ -90,7 +90,7 @@ setup(
], ],
install_requires=[ install_requires=[
'cherrypy >= 3.0', 'cherrypy >= 3.0',
'django >= 1.6.0', 'django >= 1.7.0',
'django-bootstrap-form' 'django-bootstrap-form'
], ],
package_data={'plinth': ['modules/enabled/*', package_data={'plinth': ['modules/enabled/*',