Merge branch 'release/1.3.8' into develop

getnikola · Aug 27, 2015 · 132565a · 132565a
2 parents 6627e82 + 98a62ad
commit 132565a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -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

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-25
-:Version: 1.3.7
+:Date: 2015-08-27
+:Version: 1.3.8
 
 .. index:: contributing
 

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.7'
+__version__ = '1.3.8'
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -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

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-25
-:Version: 1.3.7
+:Date: 2015-08-27
+:Version: 1.3.8
 
 .. 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.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.

diff --git a/requirements.txt b/requirements.txt
@@ -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
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.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.',