updates for upcoming release (3.7.1)

smacker · Mar 7, 2016 · fcb470f · fcb470f
1 parent ebacb7a
commit fcb470f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/README.rst b/README.rst
@@ -31,13 +31,14 @@ https://www.transifex.com/projects/p/django-filebrowser/
 Releases
 --------
 
-* FileBrowser 3.6.2 (March 6th, 2016): Compatible with Django 1.8
+* FileBrowser 3.7.1 (March 6th, 2016): Compatible with Django 1.9)
+* FileBrowser 3.6.4 (March 6th, 2016): Compatible with Django 1.8)
 * FileBrowser 3.5.8 (September 7th, 2015): Compatible with Django 1.4/1.5/1.6/1.7
 
 Current development branches:
 
-* FileBrowser 3.7.1 (Development Version for Django = 1.9, see Branch Stable/3.7.x)
-* FileBrowser 3.6.3 (Development Version for Django = 1.8, see Branch Stable/3.6.x)
+* FileBrowser 3.7.2 (Development Version for Django = 1.9, see Branch Stable/3.7.x)
+* FileBrowser 3.6.5 (Development Version for Django = 1.8, see Branch Stable/3.6.x)
 * FileBrowser 3.5.9 (Development Version for Django <= 1.7, see Branch Stable/3.5.x)
 
 Older versions are available at GitHub, but are not supported anymore.

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,21 +8,12 @@
 Changelog
 =========
 
-3.6.3 (not yet released)
+3.6.7 (not yet released)
 ------------------------
 
-3.6.2 (March 6th, 2016)
+3.7.1 (March 7th, 2016)
 -----------------------
 
-* New: Better test coverage with tox.
-* New: Added Travis CI.
-* New: Improved tests.
-* Fixed: Scale and crop with images which are either too wide or tall.
-* Improved: Renamed test image in order to fix an issue with S3 and collectstatic.
-
-3.6.1 (September 9th, 2015)
----------------------------
-
-* Compatibility with Django 1.8 and Grappelli 2.7
+* Compatibility with Django 1.9 and Grappelli 2.8
 
 For further information, see :ref:`releasenotes`.
diff --git a/docs/index.rst b/docs/index.rst
@@ -93,13 +93,14 @@ Versions and Compatibility
 
 **FileBrowser is always developed against the latest stable Django release and is NOT tested with Djangos trunk.**
 
-* FileBrowser 3.6.2 (March 6th, 2016): Compatible with Django 1.8
+* FileBrowser 3.7.1 (March 6th, 2016): Compatible with Django 1.9)
+* FileBrowser 3.6.4 (March 6th, 2016): Compatible with Django 1.8)
 * FileBrowser 3.5.8 (September 7th, 2015): Compatible with Django 1.4/1.5/1.6/1.7
 
 Current development branches:
 
-* FileBrowser 3.7.1 (Development Version for Django = 1.9, see Branch Stable/3.7.x)
-* FileBrowser 3.6.3 (Development Version for Django = 1.8, see Branch Stable/3.6.x)
+* FileBrowser 3.7.2 (Development Version for Django = 1.9, see Branch Stable/3.7.x)
+* FileBrowser 3.6.5 (Development Version for Django = 1.8, see Branch Stable/3.6.x)
 * FileBrowser 3.5.9 (Development Version for Django <= 1.7, see Branch Stable/3.5.x)
 
 Older versions are available at GitHub, but are not supported anymore.

diff --git a/setup.py b/setup.py
@@ -35,6 +35,6 @@ def read(fname):
     ],
     zip_safe=False,
     install_requires=[
-        'django-grappelli>=2.8',
+        'django-grappelli>=2.8,<2.9',
     ],
 )