updates for new release

sehmaschine · Apr 22, 2021 · 6686ffe · 6686ffe
1 parent 94764f0
commit 6686ffe
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: python
-python: 3.6
+python: 3.9
 install:
   - pip install tox
   - pip install coverage
 script:
   - tox
 env:
-  - TOXENV=py36
+  - TOXENV=py39
 branches:
   only:
-    - stable/3.13.x
+    - stable/3.14.x
diff --git a/README.rst b/README.rst
@@ -17,10 +17,10 @@ The FileBrowser is an extension to the `Django <http://www.djangoproject.com>`_
 Requirements
 ------------
 
-FileBrowser 3.13.3 requires
+FileBrowser 3.14.1 requires
 
-* Django 3.1 (http://www.djangoproject.com)
-* Grappelli 2.14 (https://github.com/sehmaschine/django-grappelli)
+* Django 3.2 (http://www.djangoproject.com)
+* Grappelli 2.15 (https://github.com/sehmaschine/django-grappelli)
 * Pillow (https://github.com/python-imaging/Pillow)
 
 Documentation
@@ -36,15 +36,17 @@ https://www.transifex.com/projects/p/django-filebrowser/
 Releases
 --------
 
+* FileBrowser 3.14.1 (April 22nd, 2021): Compatible with Django 3.2 (LTS)
 * FileBrowser 3.13.3 (April 22nd, 2021): Compatible with Django 3.1
 * FileBrowser 3.12.1 (November 14th, 2019): Compatible with Django 2.2 (LTS)
 * FileBrowser 3.9.2 (November 2nd, 2018): Compatible with Django 1.11 (LTS)
 
 Current development branches:
 
+* FileBrowser 3.14.2 (Development Version for Django 3.1, see Branch Stable/3.14.x)
 * FileBrowser 3.13.4 (Development Version for Django 3.1, see Branch Stable/3.13.x)
 * FileBrowser 3.12.2 (Development Version for Django 2.2, see Branch Stable/3.12.x)
 * FileBrowser 3.9.3 (Development Version for Django 1.11, see Branch Stable/3.9.x)
 
 Older versions are available at GitHub, but are not supported anymore.
-Support for 3.12.x and 3.9.x is limited to security issues and very important bugfixes.
+Support for 3.13.x and 3.9.x is limited to security issues and very important bugfixes.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,9 +8,14 @@
 Changelog
 =========
 
-3.13.4 (not yet released)
+3.14.2 (not yet released)
 -------------------------
 
+3.14.1 (April 22nd 2021)
+------------------------
+
+* Compatibility with Django 3.2 and Grappelli 2.15
+
 3.13.3 (April 22nd 2021)
 ------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.13.3'
+version = '3.14.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.13.3'
+release = '3.14.1'
 
 # 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
@@ -11,7 +11,7 @@ Django FileBrowser Documentation
 **Media-Management with Grappelli**.
 
 .. note::
-    |filebrowser| 3.13.3 requires Django 3.1 and |grappelli| 2.14.
+    |filebrowser| 3.14.1 requires Django 3.2 and |grappelli| 2.15.
 
 Installation and Setup
 ----------------------
@@ -92,15 +92,17 @@ Versions and Compatibility
 
 **FileBrowser is always developed against the latest stable Django release and is NOT tested with Djangos trunk.**
 
+* FileBrowser 3.14.1 (April 22nd, 2021): Compatible with Django 3.2 (LTS)
 * FileBrowser 3.13.3 (April 22nd, 2021): Compatible with Django 3.1
 * FileBrowser 3.12.1 (November 14th, 2019): Compatible with Django 2.2 (LTS)
 * FileBrowser 3.9.2 (November 2nd, 2018): Compatible with Django 1.11 (LTS)
 
 Current development branches:
 
+* FileBrowser 3.14.2 (Development Version for Django 3.1, see Branch Stable/3.14.x)
 * FileBrowser 3.13.4 (Development Version for Django 3.1, see Branch Stable/3.13.x)
 * FileBrowser 3.12.2 (Development Version for Django 2.2, see Branch Stable/3.12.x)
 * FileBrowser 3.9.3 (Development Version for Django 1.11, see Branch Stable/3.9.x)
 
 Older versions are available at GitHub, but are not supported anymore.
-Support for 3.12.x and 3.9.x is limited to security issues and very important bugfixes.
+Support for 3.13.x and 3.9.x is limited to security issues and very important bugfixes.
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -11,8 +11,8 @@ For using the |filebrowser|, `Django <http://www.djangoproject.com>`_ needs to b
 Requirements
 ------------
 
-* Django 3.1, http://www.djangoproject.com
-* Grappelli 2.14, https://github.com/sehmaschine/django-grappelli
+* Django 3.2, http://www.djangoproject.com
+* Grappelli 2.15, https://github.com/sehmaschine/django-grappelli
 * Pillow, https://github.com/python-imaging/Pillow
 
 Installation

diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -5,19 +5,19 @@
 
 .. _releasenotes:
 
-FileBrowser 3.13 Release Notes
+FileBrowser 3.14 Release Notes
 ==============================
 
-FileBrowser 3.13 is compatible with Django 3.0 as well as Grappelli 2.14.
+FileBrowser 3.14 is compatible with Django 3.2 as well as Grappelli 2.15.
 
 Updates
 -------
 
-* Compatibility with Django 3.0 and Grappelli 2.14
+* Compatibility with Django 3.2 and Grappelli 2.15
 
-Update from FileBrowser 3.12.x
+Update from FileBrowser 3.13.x
 ------------------------------
 
-* Update Django to 3.0 and check https://docs.djangoproject.com/en/3.0/releases/3.0/
-* Update Grappelli to 2.14.x
-* Update FileBrowser to 3.13.x
+* Update Django to 3.2 and check https://docs.djangoproject.com/en/3.2/releases/3.2/
+* Update Grappelli to 2.15.x
+* Update FileBrowser to 3.14.x
diff --git a/filebrowser/__init__.py b/filebrowser/__init__.py
@@ -1 +1 @@
-VERSION = '3.13.3'
+VERSION = '3.14.1'
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-django-grappelli>=2.14,<2.15
+django-grappelli>=2.15,<2.16
 pillow
 six
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
 
 setup(
     name='django-filebrowser',
-    version='3.13.3',
+    version='3.14.1',
     description='Media-Management with Grappelli',
     long_description=read('README.rst'),
     url='http://django-filebrowser.readthedocs.org',
@@ -32,10 +32,13 @@ def read(fname):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     zip_safe=False,
     install_requires=[
-        'django-grappelli>=2.14,<2.15',
+        'django-grappelli>=2.15,<2.16',
         'pillow',
         'six',
     ],

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,5 +1,5 @@
-Django>=3.0,<3.1
-django-grappelli>=2.14,<2.15
+Django>=3.2,<3.3
+django-grappelli>=2.15,<2.16
 funcsigs==0.4
 mock==1.3.0
 pbr==1.8.0

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36}
+envlist = py{39}
 
 [testenv]
 setenv =