Merge branch 'release/1.3.7'

fix #40
getnikola · Aug 25, 2015 · 74574de · 74574de
2 parents 1abf61a + 2ac5ace
commit 74574de
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.6
+:Version: 1.3.7
+
+1.3.7
+    * Nikola v7.6.4 compatibility
 
 1.3.6
     * Patch URLs for HTTPS sites

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-08-17
-:Version: 1.3.6
+:Date: 2015-08-25
+:Version: 1.3.7
 
 .. index:: contributing
 

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.6'
+__version__ = '1.3.7'
diff --git a/coil/web.py b/coil/web.py
@@ -78,8 +78,9 @@ def configure_site():
 
     nikola.__main__._RETURN_DOITNIKOLA = True
     _dn = nikola.__main__.main([])
-    _dn.sub_cmds = _dn.get_cmds()
     _site = _dn.nikola
+    _site.init_plugins()
+    _dn.sub_cmds = _dn.get_cmds()
     app.config['NIKOLA_ROOT'] = os.getcwd()
     app.config['DEBUG'] = False
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.6
+:Version: 1.3.7
+
+1.3.7
+    * Nikola v7.6.4 compatibility
 
 1.3.6
     * Patch URLs for HTTPS sites

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-08-17
-:Version: 1.3.6
+:Date: 2015-08-25
+:Version: 1.3.7
 
 .. index:: contributing
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.6'
+version = '1.3.7'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.6'
+release = '1.3.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Nikola>=7.5.1
+Nikola>=7.6.4
 docopt==0.6.2
 Flask==0.10.1
 Flask-Bcrypt==0.6.2

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='coil',
-      version='1.3.6',
+      version='1.3.7',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',