Prepare for work on v1.6.

Author: spectras

.travis.yml

@@ -5,12 +5,12 @@ python:
   - 3.4
   - 3.5
 env:
-  - DJANGO=django==1.7.10 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
-  - DJANGO=django==1.7.10 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
-  - DJANGO=django==1.8.6 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
-  - DJANGO=django==1.8.6 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
-  - DJANGO=https://github.com/django/django/tarball/stable/1.9.x DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
-  - DJANGO=https://github.com/django/django/tarball/stable/1.9.x DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=django==1.8.9 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=django==1.8.9 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+  - DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+  - DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
 
 sudo: false
 install:
@@ -28,10 +28,10 @@ after_success:
 matrix:
   exclude:
     - python: 3.3
-      env: DJANGO=https://github.com/django/django/tarball/stable/1.9.x DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+      env: DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
     - python: 3.3
-      env: DJANGO=https://github.com/django/django/tarball/stable/1.9.x DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+      env: DJANGO=django==1.9.2 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
     - python: 3.5
-      env: DJANGO=django==1.7.10 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
+      env: DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=mysql://root@localhost/test
     - python: 3.5
-      env: DJANGO=django==1.7.10 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test
+      env: DJANGO=django==1.7.11 DRF=3.3.1 DATABASE_URL=postgres://postgres@localhost/test

README.rst

@@ -113,10 +113,9 @@ Releases
 Django-hvad uses the same release pattern as Django. The following versions
 are thus available:
 
-* Stable branch 1.2, available through `PyPI`_ and git branch ``releases/1.2.x``.
-* Stable branch 1.3, available through `PyPI`_ and git branch ``releases/1.3.x``.
 * Stable branch 1.4, available through `PyPI`_ and git branch ``releases/1.4.x``.
-* Development branch 1.5, available through git branch ``master``.
+* Stable branch 1.5, available through `PyPI`_ and git branch ``releases/1.5.x``.
+* Development branch 1.6, available through git branch ``master``.
 
 Stable branches have minor bugfix releases as needed, with guaranteed compatibility.
 See the `installation guide`_ for details, or have a look at the `release notes`_.

docs/conf.py

@@ -44,8 +44,8 @@
 project = u'django-hvad'
 copyright = u'2011-2015, Kristian Øllegaard, Jonas Obrist & contributors'
 
-version = '1.5'
-release = '1.5.0'
+version = '1.6'
+release = '1.6.0'
 
 
 # The name of the Pygments (syntax highlighting) style to use.

docs/index.rst

@@ -20,13 +20,11 @@ The guideline is hvad supports all Django versions that are supported by the
 Django team. This holds true for Long-Term Support releases as well. Support for
 new versions will usually be introduced when they reach the beta stage.
 
-Thus, django-hvad 1.4 is tested on the following configurations:
+Thus, django-hvad 1.5 is tested on the following configurations:
 
-- Django 1.4.22, running Python 2.7.
-- Django 1.6.11, running Python 2.7 or 3.3.
-- Django 1.7.10, running Python 2.7, 3.3 or 3.4.
-- Django 1.8.6, running Python 2.7, 3.3, 3.4 or 3.5.
-- Django 1.9.0beta, running Python 2.7, 3.4 or 3.5.
+- Django 1.7.11, running Python 2.7, 3.3 or 3.4.
+- Django 1.8.9, running Python 2.7, 3.3, 3.4 or 3.5.
+- Django 1.9.2, running Python 2.7, 3.4 or 3.5.
 
 All tests are run against MySQL and PostgreSQL.
 

docs/public/release_notes.rst

@@ -5,9 +5,16 @@ Release Notes
 .. release 1.5.0
 
 *****************************
-1.5.0 - upcoming release
+1.5.0 - current release
 *****************************
 
+Released on February 2, 2016
+
+Python and Django versions supported:
+
+- Django 1.4 LTS is no longer supported.
+- So, as a reminder, supported Django versions for this release are: 1.7, 1.8 LTS, 1.9.
+
 New features:
 
 - It is now possible to specify a :ref:`custom translation base <custom-translation-models>`
@@ -42,7 +49,7 @@ Fixes:
 .. release 1.4.0
 
 *****************************
-1.4.0 - current release
+1.4.0
 *****************************
 
 Released on November 10, 2015

hvad/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '1.5.0'
-VERSION = (1, 5, 0)
+__version__ = '1.6.0'
+VERSION = (1, 6, 0)

setup.py

@@ -22,7 +22,7 @@
     zip_safe=False,
     include_package_data = True,
     install_requires=[
-        'Django>=1.4',
+        'Django>=1.7',
     ],
     classifiers = [
         "Development Status :: 5 - Production/Stable",
@@ -33,6 +33,7 @@
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Topic :: Database",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Text Processing :: Linguistic",