Merge pull request #27 from sebastiangithub94/master

django 1.10.5/cms 3.4.2
palazzem · Feb 21, 2017 · bcd869f · bcd869f
2 parents 37d41fb + 1e1a192
commit bcd869f
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 33 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,17 @@
 Changelog
 =========
 
+0.3.2 (2017-02-20)
+------------------
+
+* Update Django CMS 3.4.2
+* Update Django 1.10.5
+
+Other changes:
+
+* removed djangcms-link from base.txt 
+* removed djangocms-column from base.txt
+
 0.3.1 (2016-08-27)
 ------------------
 

diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt
@@ -1,35 +1,40 @@
-# Django
-Django==1.9.11
+# Django 
+Django==1.10.5
 
 # Django CMS + dependencies
-django-classy-tags==0.7.2
-django-compressor==2.1
-django-cms==3.4.1
-django-formtools==1.0
-django-sekizai==0.9.0
-django-treebeard==4.0.1
-djangocms-admin-style==1.2.3
-djangocms-text-ckeditor==2.9.1
+appdirs==1.4.0
+django-appconf==1.0.2
+django-classy-tags==0.8.0
+django-cms==3.4.2
+django-compressor==2.1.1
+django-formtools==2.0
+django-sekizai==0.10.0
+django-treebeard==4.1.0
+djangocms-admin-style==1.2.6.2
+djangocms-text-ckeditor==3.4.0
 html5lib==0.9999999
+olefile==0.44
+packaging==16.8
+Pillow==4.0.0
+pyparsing==2.1.10
+rcssmin==1.0.6
+rjsmin==1.0.12
 six==1.10.0
-Pillow==3.3.1
 
 {% if cookiecutter.django_filer == "y" or cookiecutter.django_filer == "Y" %}
 # Django filer plugin
-django-filer==1.2.4
+django-filer==1.2.6
 easy-thumbnails==2.3
-cmsplugin-filer==1.1.2
+cmsplugin-filer==1.1.3
 {% endif %}
 
 {% if cookiecutter.extra_plugins == "y" or cookiecutter.extra_plugins == "Y" %}
-djangocms-column==1.6.0
-djangocms-style==1.7.0
-djangocms-googlemap==0.5.1
+djangocms-style==2.0.1
+djangocms-googlemap==1.0.2
 djangocms-inherit==0.2.1
-Django-Select2==4.3.2
-djangocms-link==1.8.2
+Django-Select2==5.8.10
 {% endif %}
 
-django-reversion==1.10.0
-django-rq==0.9.1
+django-reversion==2.0.8
+django-rq==0.9.4
 redis==2.10.5
diff --git a/{{cookiecutter.repo_name}}/requirements/development.txt b/{{cookiecutter.repo_name}}/requirements/development.txt
@@ -2,4 +2,4 @@
 
 -r base.txt
 
-django-debug-toolbar==1.5
+django-debug-toolbar==1.6
diff --git a/....repo_name}}/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/settings/base.py b/....repo_name}}/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/settings/base.py
@@ -138,21 +138,21 @@
             'context_processors': [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'django.core.context_processors.i18n',
-                'django.core.context_processors.debug',
-                'django.core.context_processors.request',
-                'django.core.context_processors.media',
-                'django.core.context_processors.csrf',
-                'django.core.context_processors.tz',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.template.context_processors.media',
+                'django.template.context_processors.csrf',
+                'django.template.context_processors.tz',
                 'sekizai.context_processors.sekizai',
-                'django.core.context_processors.static',
+                'django.template.context_processors.static',
                 'cms.context_processors.cms_settings'
             ]
         },
     },
 ]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'cms.middleware.utils.ApphookReloadMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -207,8 +207,6 @@
     {% if cookiecutter.extra_plugins == "y" or cookiecutter.extra_plugins == "Y" %}
     'django_select2',
     'djangocms_style',
-    'djangocms_column',
-    'djangocms_link',
     'djangocms_inherit',
     'djangocms_text_ckeditor',
     {% endif %}

diff --git a/...okiecutter.project_name}}/settings/dev.py → ...er.project_name}}/settings/dev_example.py b/...okiecutter.project_name}}/settings/dev.py → ...er.project_name}}/settings/dev_example.py
@@ -16,12 +16,12 @@
     }
 }
 
-MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 
 SECRET_KEY = 'devel'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 SITE_ID = 2
 
-AUTH_PASSWORD_VALIDATORS = []
+AUTH_PASSWORD_VALIDATORS = []
diff --git a/...ter.project_name}}/settings/production.py → ...ect_name}}/settings/production_example.py b/...ter.project_name}}/settings/production.py → ...ect_name}}/settings/production_example.py