diff --git a/app/deploy/django.py b/app/deploy/django.py index 3225385..0302b35 100644 --- a/app/deploy/django.py +++ b/app/deploy/django.py @@ -23,4 +23,4 @@ class DjangoDeployment(Debian): def python_packages_install(self): """ Run Django management command in 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__) diff --git a/app/requirements.txt b/app/requirements.txt index c72e40b..ed9584c 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -25,7 +25,7 @@ django-mptt==0.7.4 django-multipleformwizard==0.2.16 django-parler==1.5.1 django-phonenumber-field==0.7.2 -django-pipeline==1.5.4 +django-pipeline==1.5.1 django-polymorphic==0.7.2 django-reversion==1.9.3 django-sekizai==0.8.2 diff --git a/app/settings.py b/app/settings.py index 02c5f76..0fb73aa 100644 --- a/app/settings.py +++ b/app/settings.py @@ -88,8 +88,9 @@ STATICFILES_DIRS = ( STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'pipeline.finders.FileSystemFinder', + 'pipeline.finders.AppDirectoriesFinder', + 'pipeline.finders.CachedFileFinder', 'pipeline.finders.PipelineFinder', ) @@ -129,6 +130,7 @@ PIPELINE_CSS = { 'output_filename': 'css/main.css', } } + SITE_ID = 1 TEMPLATE_LOADERS = ( @@ -267,7 +269,7 @@ INSTALLED_APPS = ( # 'debug_toolbar', 'djangocms_forms', 'smartsnippets', - 'easy_select2', + # 'easy_select2', 'promo', 'trademark',