master
Alexander Kondratyev 9 years ago
parent 86f46363a2
commit aaebb95240
  1. 2
      app/deploy/django.py
  2. 2
      app/requirements.txt
  3. 8
      app/settings.py

@ -23,4 +23,4 @@ class DjangoDeployment(Debian):
def python_packages_install(self): def python_packages_install(self):
""" Run Django management command in virtualenv. """ """ Run Django management command in virtualenv. """
# Activate the virtualenv. # Activate the virtualenv.
self._virtualenv('pip install --upgrade pip && pip install -r %(PROJECT_DIR)s/requirements.txt --upgrade' % settings.__dict__) self._virtualenv('pip install --upgrade pip && pip install -r %(PROJECT_DIR)s/app/requirements.txt --upgrade' % settings.__dict__)

@ -25,7 +25,7 @@ django-mptt==0.7.4
django-multipleformwizard==0.2.16 django-multipleformwizard==0.2.16
django-parler==1.5.1 django-parler==1.5.1
django-phonenumber-field==0.7.2 django-phonenumber-field==0.7.2
django-pipeline==1.5.4 django-pipeline==1.5.1
django-polymorphic==0.7.2 django-polymorphic==0.7.2
django-reversion==1.9.3 django-reversion==1.9.3
django-sekizai==0.8.2 django-sekizai==0.8.2

@ -88,8 +88,9 @@ STATICFILES_DIRS = (
STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
STATICFILES_FINDERS = ( STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder', 'pipeline.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'pipeline.finders.AppDirectoriesFinder',
'pipeline.finders.CachedFileFinder',
'pipeline.finders.PipelineFinder', 'pipeline.finders.PipelineFinder',
) )
@ -129,6 +130,7 @@ PIPELINE_CSS = {
'output_filename': 'css/main.css', 'output_filename': 'css/main.css',
} }
} }
SITE_ID = 1 SITE_ID = 1
TEMPLATE_LOADERS = ( TEMPLATE_LOADERS = (
@ -267,7 +269,7 @@ INSTALLED_APPS = (
# 'debug_toolbar', # 'debug_toolbar',
'djangocms_forms', 'djangocms_forms',
'smartsnippets', 'smartsnippets',
'easy_select2', # 'easy_select2',
'promo', 'promo',
'trademark', 'trademark',

Loading…
Cancel
Save