Merge branch 'release/0.1.2' into production

* release/0.1.2:
  bump version, update changelog
  update dependencies
  update to Django 1.7.1
  remove unnecessary dependency on South
  add project page link

README.rst

@@ -9,3 +9,5 @@ customer management at `Jan Dittberner IT-Consulting & -Solutions
 <http://www.gnuviech-server.de>`_.
 
 Read the :doc:`Installation instructions <install>` to get started locally.
+
+The project page for gvaldap is at http://dev.gnuviech-server.de/gvaldap.

docs/changelog.rst

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :release:`0.1.2 <2014-12-17>`
+* :support:`-` update Django and other dependencies
+
 * :release:`0.1.1 <2014-05-31>`
 * :support:`-` improve production settings
   - no custom cache and database

docs/conf.py

@@ -57,9 +57,9 @@ copyright = u'2014, Jan Dittberner'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '0.1.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '0.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

gvaldap/gvaldap/settings/base.py

@@ -207,6 +207,11 @@ ROOT_URLCONF = '%s.urls' % SITE_NAME
 ########## END URL CONFIGURATION
 
 
+########## TEST RUNNER CONFIGURATION
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+########## END TEST RUNNER CONFIGURATION
+
+
 ########## APP CONFIGURATION
 DJANGO_APPS = (
     # Default Django apps:
@@ -281,17 +286,6 @@ USER_BASE_DN = get_env_setting('GVALDAP_BASEDN_USER')
 ########## END LDAP SETTINGS
 
 
-########## SOUTH CONFIGURATION
-# See: http://south.readthedocs.org/en/latest/installation.html#configuring-your-django-installation
-INSTALLED_APPS += (
-    # Database migration helpers:
-    'south',
-)
-# Don't need to use South when setting up a test database.
-SOUTH_TESTS_MIGRATE = False
-########## END SOUTH CONFIGURATION
-
-
 ########## CELERY CONFIGURATION
 BROKER_URL = get_env_setting('GVALDAP_BROKER_URL')
 CELERY_RESULT_BACKEND = 'amqp'

requirements/base.txt

@@ -1,10 +1,9 @@
-Django==1.6.5
+Django==1.7.1
 django-ldapdb==0.3.2
-bpython==0.13
+bpython==0.13.1
 django-braces==1.4.0
-django-model-utils==2.0.3
+django-model-utils==2.2
 logutils==0.3.3
-South==0.8.4
-celery==3.1.11
+celery==3.1.17
 passlib==1.6.2
-pyaml==14.05.7
+pyaml==14.12.10

requirements/local.txt

@@ -1,7 +1,7 @@
 # Local development dependencies go here
 -r base.txt
 coverage==3.7.1
-django-debug-toolbar==1.2.1
-Sphinx==1.2.2
-sqlparse==0.1.11
-releases==0.6.1
+django-debug-toolbar==1.2.2
+Sphinx==1.2.3
+sqlparse==0.1.14
+releases==0.7.0