v1.1.0

jkbrzt · Mar 10, 2016 · 549d4ca · 549d4ca
1 parent 3f9255c
commit 549d4ca
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.3
   - 3.4
+  - 3.5
   - pypy
   - pypy3
 env:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -0,0 +1,14 @@
+==========
+Change Log
+==========
+
+This document records all notable changes to
+`django-settings-export <https://github.com/jkbrzt/django-settings-export>`_.
+This project adheres to `Semantic Versioning <http://semver.org/>`_.
+
+
+1.1.0 (2016-03-20)
+------------------
+
+* Added ability to set the name of the context variable to something besides
+  ``settings`` via ``SETTINGS_EXPORT_VARIABLE_NAME``.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include README.rst LICENCE
+include README.rst CHANGELOG.rst LICENCE
diff --git a/README.rst b/README.rst
@@ -98,15 +98,15 @@ via ``settings.<KEY>``:
 * Accessing a unexported setting key on the ``settings`` object in a template
   results in an ``UnexportedSettingError``.
 
-
-See also the bundled
-`demo app <https://github.com/jkbrzt/django-settings-export/tree/master/demo>`_.
-
 If you wish to change the name of the context variable to something besides
 ``settings``, add ``SETTINGS_EXPORT_VARIABLE_NAME = 'settings_name'`` to your settings.py.
 This is useful when some other plugin is already adding ``settings`` to your
 template contexts.
 
+See also the bundled
+`demo app <https://github.com/jkbrzt/django-settings-export/tree/master/demo>`_.
+
+
 Development
 ===========
 
@@ -123,6 +123,12 @@ Development
     # Run tests on all Pythons
     $ tox
 
+==========
+Change Log
+==========
+
+See `CHANGELOG <https://github.com/jkbrzt/django-settings-export/blob/master/CHANGELOG.rst>`_.
+
 
 Licence
 =======
@@ -152,4 +158,3 @@ Jakub Roztocil
 .. |coverage| image:: https://img.shields.io/coveralls/jkbrzt/django-settings-export.svg?branch=master
     :target: https://coveralls.io/r/jkbrzt/django-settings-export?branch=master
     :alt: Coverage
-
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name="django-settings-export",
-    version='1.0.6',
+    version='1.1.0',
     author="Jakub Roztocil",
     author_email="jakub@roztocil.co",
     description='This Django app allows you to export'

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 # http://tox.testrun.org/
 
 [tox]
-envlist = py27, py34, pypy
+envlist = py27, py35, pypy
 
 
 [testenv]