From a8ce003ed88ec64aec9158ae02e0abc7ad5187e2 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 1 Jun 2014 00:07:17 +0200 Subject: [PATCH 1/5] add project page link --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 97c5c6d..8bf40ed 100644 --- a/README.rst +++ b/README.rst @@ -9,3 +9,5 @@ customer management at `Jan Dittberner IT-Consulting & -Solutions `_. Read the :doc:`Installation instructions ` to get started locally. + +The project page for gvaldap is at http://dev.gnuviech-server.de/gvaldap. From 06df1c5f0b3b0254c8f3d0ea23002adaf0368dc0 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 17 Dec 2014 21:12:32 +0100 Subject: [PATCH 2/5] remove unnecessary dependency on South --- gvaldap/gvaldap/settings/base.py | 11 ----------- requirements/base.txt | 1 - 2 files changed, 12 deletions(-) diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py index 46c8740..c486b44 100644 --- a/gvaldap/gvaldap/settings/base.py +++ b/gvaldap/gvaldap/settings/base.py @@ -281,17 +281,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' diff --git a/requirements/base.txt b/requirements/base.txt index a00a80c..21ac625 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,6 @@ bpython==0.13 django-braces==1.4.0 django-model-utils==2.0.3 logutils==0.3.3 -South==0.8.4 celery==3.1.11 passlib==1.6.2 pyaml==14.05.7 From 6db4fbd73e25eddce860de4c3aa36bc1f8aa52c5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 17 Dec 2014 21:24:34 +0100 Subject: [PATCH 3/5] update to Django 1.7.1 --- gvaldap/gvaldap/settings/base.py | 5 +++++ requirements/base.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py index c486b44..f985254 100644 --- a/gvaldap/gvaldap/settings/base.py +++ b/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: diff --git a/requirements/base.txt b/requirements/base.txt index 21ac625..d0ff8dc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -Django==1.6.5 +Django==1.7.1 django-ldapdb==0.3.2 bpython==0.13 django-braces==1.4.0 From 911d321eb91e48a31bdd5011fc7e66882f9d3da5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 17 Dec 2014 21:32:42 +0100 Subject: [PATCH 4/5] update dependencies --- requirements/base.txt | 8 ++++---- requirements/local.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index d0ff8dc..17520d2 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,9 +1,9 @@ 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 -celery==3.1.11 +celery==3.1.17 passlib==1.6.2 -pyaml==14.05.7 +pyaml==14.12.10 diff --git a/requirements/local.txt b/requirements/local.txt index 8e4f5a9..4bdfc63 100644 --- a/requirements/local.txt +++ b/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 From dfe1239ff8d9ccaed16568052bfd74dceda600cd Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 17 Dec 2014 22:06:16 +0100 Subject: [PATCH 5/5] bump version, update changelog --- docs/changelog.rst | 3 +++ docs/conf.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8c0658d..6a20d48 100644 --- a/docs/changelog.rst +++ b/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 diff --git a/docs/conf.py b/docs/conf.py index fda7743..94d9feb 100644 --- a/docs/conf.py +++ b/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.