Merge branch 'dev'

update version to 1.0.0 [ci skip]
st4lk · Apr 13, 2015 · 01c9650 · 01c9650
2 parents 77cf836 + 2db345b
commit 01c9650
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Requirements
 -----------
 
 - python (2.6, 2.7, 3.2, 3.3, 3.4)
-- django (1.4, 1.5, 1.6, 1.7)
+- django (1.4, 1.5, 1.6, 1.7, 1.8)
 
 Release notes
 -------------

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,14 @@
 solid_i18n release notes
 ========================
 
+v1.0.0
+------
+
+ - Add django 1.8 support
+
+Issues: [#8](https://github.com/st4lk/django-solid-i18n-urls/issues/8)
+Issues: [#19](https://github.com/st4lk/django-solid-i18n-urls/issues/19)
+
 v0.9.1
 ------
 

diff --git a/solid_i18n/__init__.py b/solid_i18n/__init__.py
@@ -1,6 +1,6 @@
 import warnings
 __author__ = 'st4lk'
-__version__ = '0.9.1'
+__version__ = '1.0.0'
 
 try:
     from django import VERSION
@@ -10,6 +10,5 @@
     DEPRECATED_DJANGO_VERSIONS = [(1, 5)]
 
     if VERSION[:2] in DEPRECATED_DJANGO_VERSIONS:
-        warnings.warn("Support of Django versions %s will be dropped in "
-            "1.0 version of solid_i18n" % DEPRECATED_DJANGO_VERSIONS,
-            PendingDeprecationWarning)
+        warnings.warn("Support of Django versions %s will be dropped soon"
+            % DEPRECATED_DJANGO_VERSIONS, PendingDeprecationWarning)