Merge pull request #81 from littleweaver/2.2.0

2.2.0
melinath · Apr 13, 2016 · 468b6a7 · 468b6a7
2 parents 78ffb44 + 02db3e7
commit 468b6a7
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -32,7 +32,7 @@ Requirements
 * Django 1.7 & 1.8
 * Six 1.10.0+
 
-Daguerre *may* work with earlier versions of these packages, but they are not officially supported.
+Daguerre *may* work with earlier or later versions of these packages, but they are not officially supported.
 
 Installation
 ------------

diff --git a/daguerre/__init__.py b/daguerre/__init__.py
@@ -1 +1 @@
-__version__ = (2, 2, '0-a')
+__version__ = (2, 2, 0)
diff --git a/docs/conf.py b/docs/conf.py
@@ -45,7 +45,7 @@
 
 # General information about the project.
 project = u'Django Daguerre'
-copyright = u'2010-2014, Little Weaver Web Collective, LLC'
+copyright = u'2010-2016, Little Weaver Web Collective, LLC'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.0-a'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -57,6 +57,15 @@ API Docs
    api/models
 
 
+Release Notes
+-------------
+
+.. toctree::
+   :maxdepth: 2
+
+   release-notes/index
+
+
 Indices and tables
 ------------------
 

diff --git a/docs/release-notes/2.2.0.rst b/docs/release-notes/2.2.0.rst
@@ -0,0 +1,7 @@
+2.2.0 (2016-04-13)
+------------------
+
+* Improved efficiency of adjusted image queries (thanks `@mislavcimpersak <https://github.com/mislavcimpersak>`_!)
+* Fixed some minor image adjustment bugs.
+* Added Jinja template support.
+* Added compatibility with Django 1.8
diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
@@ -0,0 +1,7 @@
+Release Notes
+-------------
+
+.. toctree::
+   :maxdepth: 2
+
+   2.2.0
diff --git a/setup.py b/setup.py
@@ -18,9 +18,9 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'Pillow>=2.3.0',
-        'django>=1.7',
-        'six>=1.3.0',
+        'Pillow<=2.7.0',
+        'django>=1.7,<1.9',
+        'six>=1.10.0',
     ],
     extras_require={
         'docs': ["sphinx-rtd-theme>=0.1.5"],