soft update requirements

.gitignore

@@ -14,5 +14,5 @@ builddocs.zip
 build/
 dist/
 src/django_slim.egg-info
-src/slim/readme.rst
+src/slim/README.rst
 example/media/foo-images/

.hgignore

@@ -15,5 +15,5 @@ tox.ini~
 ^build/
 ^dist/
 ^src/django_slim.egg-info
-^src/slim/readme.rst
-^example/media/foo-images/
+^src/slim/README.rst
+^example/media/foo-images/

CHANGELOG.rst

@@ -1,5 +1,11 @@
 Release history
 =====================================
+0.7.3
+-------------------------------------
+2014-05-22
+
+- Softened dependencies.
+
 0.7.2
 -------------------------------------
 2013-12-24

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.2'
+version = '0.7.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.2'
+release = '0.7.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

example/example/foo/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('foo.views',
     # Listing URL

example/requirements.txt

@@ -2,5 +2,5 @@ Django==1.5.5
 Pillow==2.1.0
 argparse==1.2.1
 django-localeurl==1.5
-six==1.4.1
+#six==1.4.1
 -e git+https://github.com/barseghyanartur/django-slim/@stable#egg=django-slim

setup.py

@@ -7,10 +7,10 @@
 except:
   readme = ''
 
-version = '0.7.2'
+version = '0.7.3'
 
 install_requires = [
-    'six==1.4.1',
+    'six>=1.4.1,<=1.6.1',
 ]
 
 try:

src/slim/__init__.py

@@ -1,3 +1,10 @@
+__title__ = 'slim'
+__version__ = '0.7.3'
+__build__ = 0x000012
+__author__ = 'Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
+
 from slim.helpers import *
 from slim.models import *
 from slim.models.fields import *

src/slim/admin.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.admin'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('SlimAdmin',)
 
 from django.utils.translation import ugettext_lazy as _

src/slim/conf.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.conf'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('get_setting',)
 
 from django.conf import settings

src/slim/defaults.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.defaults'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('USE_LOCALEURL', 'USE_LOCAL_LANGUAGE_NAMES', 'ENABLE_MONKEY_PATCHING')
 
 # If set to False, `django-localeurl` usage in `slim` is force-disabled.

src/slim/exceptions.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.exceptions'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('LocaleurlImportError',)
 
 class LocaleurlImportError(ImportError):

src/slim/helpers.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.helpers'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('get_default_language', 'default_language', 'get_languages', 'get_languages_keys', \
            'get_language_from_request', 'get_languages_dict', 'admin_change_url', 'admin_add_url', 'smart_resolve')
 

src/slim/models/__init__.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.models.__init__'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('Slim', 'SlimBaseModel')
 
 from six import PY2

src/slim/models/decorators.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.models.decorators'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('prepend_language', 'localeurl_prepend_language', 'auto_prepend_language')
 
 from slim.utils import locale_url_is_installed

src/slim/models/fields.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.models.fields'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('LanguageField', 'SimpleLanguageField')
 
 from six import PY2

src/slim/settings.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.settings'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('USE_LOCALEURL', 'USE_LOCAL_LANGUAGE_NAMES', 'ENABLE_MONKEY_PATCHING')
 
 from slim.conf import get_setting

src/slim/tests.py

@@ -2,7 +2,7 @@
 
 __title__ = 'slim.tests'
 __author__ = 'Artur Barseghyan <[email protected]>'
-__copyright__ = 'Copyright (c) 2013 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 
 import unittest

src/slim/translations.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.translations'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('short_language_code', 'is_primary_language')
 
 from django.utils import translation

src/slim/utils.py

@@ -1,7 +1,7 @@
 __title__ = 'slim.utils'
-__version__ = '0.7'
-__build__ = 0x000007
 __author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = 'Copyright (c) 2013-2014 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('locale_url_is_installed',)
 
 from django.conf import settings