From 2ac5acee6e6c75bf87242d8753f2539a62e84e9d Mon Sep 17 00:00:00 2001 From: Chris Warrick Date: Tue, 25 Aug 2015 16:20:32 +0200 Subject: [PATCH] v1.3.7: Nikola v7.6.4 compatibility Signed-off-by: Chris Warrick --- CHANGELOG.rst | 5 ++++- CONTRIBUTING.rst | 4 ++-- coil/__init__.py | 2 +- coil/web.py | 3 ++- docs/CHANGELOG.rst | 5 ++++- docs/CONTRIBUTING.rst | 4 ++-- docs/conf.py | 4 ++-- requirements.txt | 2 +- setup.py | 2 +- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7159035..969012c 100644 --- 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 index 474ce3a..5b56e58 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -5,8 +5,8 @@ Appendix A. Contribution rules :Author: Chris Warrick :Copyright: © 2015, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -: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 index 1382a84..b1148b7 100644 --- 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 index d55ab85..964b591 100644 --- 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 index 7159035..969012c 100644 --- 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 index 474ce3a..5b56e58 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -5,8 +5,8 @@ Appendix A. Contribution rules :Author: Chris Warrick :Copyright: © 2015, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) -: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 index 91e7a94..f79090f 100644 --- 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 index 9e8606d..3427a7d 100644 --- 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 index 9727e44..ca9fb74 100755 --- 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.',