Skip to content
Permalink
Browse files

Merge branch 'release/1.3.8' into develop

  • Loading branch information
Kwpolska committed Aug 27, 2015
2 parents 6627e82 + 98a62ad commit 132565afaeea5fb329c46a448911bd35baa9e204
Showing with 24 additions and 24 deletions.
  1. +4 −1 CHANGELOG.rst
  2. +2 −2 CONTRIBUTING.rst
  3. +1 −1 coil/__init__.py
  4. +4 −1 docs/CHANGELOG.rst
  5. +2 −2 docs/CONTRIBUTING.rst
  6. +2 −2 docs/conf.py
  7. +8 −14 requirements.txt
  8. +1 −1 setup.py
@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.7
:Version: 1.3.8

1.3.8
* Clean up requirements (issue #40)

1.3.7
* Nikola v7.6.4 compatibility
@@ -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-25
:Version: 1.3.7
:Date: 2015-08-27
:Version: 1.3.8

.. index:: contributing

@@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.7'
__version__ = '1.3.8'
@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.7
:Version: 1.3.8

1.3.8
* Clean up requirements (issue #40)

1.3.7
* Nikola v7.6.4 compatibility
@@ -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-25
:Version: 1.3.7
:Date: 2015-08-27
:Version: 1.3.8

.. index:: contributing

@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '1.3.7'
version = '1.3.8'
# The full version, including alpha/beta/rc tags.
release = '1.3.7'
release = '1.3.8'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -3,19 +3,13 @@ docopt==0.6.2
Flask==0.10.1
Flask-Bcrypt==0.6.2
Flask-Login==0.2.11
Flask-WTF==0.11
itsdangerous==0.24
Jinja2==2.7.3
MarkupSafe==0.23
passlib==1.6.2
Flask-WTF==0.12
WTForms==2.0.2
passlib==1.6.5
requests==2.7.0
redis==2.10.3
rq==0.5.5
webassets==0.11.1
Logbook==0.10.1
py-bcrypt==0.4
pyinotify==0.9.5
python-bcrypt==0.3.1
pytz==2015.2
redis==2.10.3
requests==2.7.0
rq==0.5.3
six==1.9.0
webassets==0.10.1
Werkzeug==0.10.4
WTForms==2.0.2
@@ -7,7 +7,7 @@
dependencies = [l.strip() for l in fh]

setup(name='coil',
version='1.3.7',
version='1.3.8',
description='A user-friendly CMS frontend for Nikola.',
keywords='coil,nikola,cms',
author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',

0 comments on commit 132565a

Please sign in to comment.
You can’t perform that action at this time.