From 546441d49920caf43eb7d33976c2d71ae85f16d5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 1 Jan 2015 22:32:37 +0100 Subject: [PATCH 1/6] unify routers, add support for mysql and pgsql tasks - add new celeryrouters.GvaRouter - remove LdapRouter and FileRouter --- .gitignore | 1 + celeryrouters.py | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3bb2efd..5f1ace6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .*.swp *.pyc +.ropeproject/ diff --git a/celeryrouters.py b/celeryrouters.py index e468813..ec7b122 100644 --- a/celeryrouters.py +++ b/celeryrouters.py @@ -2,23 +2,14 @@ from __future__ import unicode_literals -class LdapRouter(object): +class GvaRouter(object): def route_for_task(self, task, args=None, kwargs=None): - if 'ldap' in task: - return {'exchange': 'ldap', + for route in ['ldap', 'file', 'mysql', 'pgsql']: + if route in task: + return { + 'exchange': route, 'exchange_type': 'direct', - 'queue': 'ldap'} + 'queue': route, + } return None - - -class FileRouter(object): - - def route_for_task(self, task, args=None, kwargs=None): - if 'file' in task: - return {'exchange': 'file', - 'exchange_type': 'direct', - 'queue': 'file'} - return None - - From f5c2970a3162348070df342597947027cdfb0b69 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 1 Jan 2015 22:37:05 +0100 Subject: [PATCH 2/6] switch to gvacommon.celeryrouters.GvaRouter --- gvaldap/gvaldap/settings/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py index de70798..03a52b1 100644 --- a/gvaldap/gvaldap/settings/base.py +++ b/gvaldap/gvaldap/settings/base.py @@ -291,8 +291,7 @@ CELERY_RESULT_BACKEND = 'amqp' CELERY_RESULT_PERSISTENT = True CELERY_TASK_RESULT_EXPIRES = None CELERY_ROUTES = ( - 'gvacommon.celeryrouters.LdapRouter', - 'gvacommon.celeryrouters.FileRouter', + 'gvacommon.celeryrouters.GvaRouter', ) CELERY_TIMEZONE = 'Europe/Berlin' CELERY_ENABLE_UTC = True From e489ecb7979f061fee1afc9541ea130e646e1674 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 19 Jan 2015 21:27:19 +0100 Subject: [PATCH 3/6] move osusers to ldaptasks --- gvaldap/gvaldap/settings/base.py | 2 +- gvaldap/ldaptasks/__init__.py | 4 ++++ gvaldap/{osusers => ldaptasks}/tasks.py | 0 gvaldap/osusers/__init__.py | 3 --- gvaldap/osusers/models.py | 3 --- 5 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 gvaldap/ldaptasks/__init__.py rename gvaldap/{osusers => ldaptasks}/tasks.py (100%) delete mode 100644 gvaldap/osusers/__init__.py delete mode 100644 gvaldap/osusers/models.py diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py index 03a52b1..3d12927 100644 --- a/gvaldap/gvaldap/settings/base.py +++ b/gvaldap/gvaldap/settings/base.py @@ -232,7 +232,7 @@ DJANGO_APPS = ( # Apps specific for this project go here. LOCAL_APPS = ( 'ldapentities', - 'osusers', + 'ldaptasks', ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps diff --git a/gvaldap/ldaptasks/__init__.py b/gvaldap/ldaptasks/__init__.py new file mode 100644 index 0000000..a2fa51e --- /dev/null +++ b/gvaldap/ldaptasks/__init__.py @@ -0,0 +1,4 @@ +""" +This module contains :py:mod:`ldaptasks.tasks`. + +""" diff --git a/gvaldap/osusers/tasks.py b/gvaldap/ldaptasks/tasks.py similarity index 100% rename from gvaldap/osusers/tasks.py rename to gvaldap/ldaptasks/tasks.py diff --git a/gvaldap/osusers/__init__.py b/gvaldap/osusers/__init__.py deleted file mode 100644 index b960717..0000000 --- a/gvaldap/osusers/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -This module contains :py:mod:`osusers.tasks`. -""" diff --git a/gvaldap/osusers/models.py b/gvaldap/osusers/models.py deleted file mode 100644 index d1ff455..0000000 --- a/gvaldap/osusers/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Empty models module required for Django to accept this as an app. -""" From f5f47ca1010f98de5048a93d72d8bd08a66dd953 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 19 Jan 2015 21:29:06 +0100 Subject: [PATCH 4/6] adapt code documentation to changed module structure --- docs/code.rst | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/code.rst b/docs/code.rst index 9001a7b..7b85d45 100644 --- a/docs/code.rst +++ b/docs/code.rst @@ -16,82 +16,82 @@ The project module :py:mod:`gvaldap` .. automodule:: gvaldap -:py:mod:`gvaldap.celery` ------------------------- +:py:mod:`celery ` +--------------------------------- .. automodule:: gvaldap.celery :members: -:py:mod:`gvaldap.urls` ----------------------- +:py:mod:`urls ` +----------------------------- .. automodule:: gvaldap.urls -:py:mod:`gvaldap.wsgi` ----------------------- +:py:mod:`wsgi ` +----------------------------- .. automodule:: gvaldap.wsgi :members: -:py:mod:`gvaldap.settings` --------------------------- +:py:mod:`settings ` +------------------------------------- .. automodule:: gvaldap.settings -:py:mod:`gvaldap.settings.base` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +:py:mod:`base ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. automodule:: gvaldap.settings.base :members: -:py:mod:`gvaldap.settings.local` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +:py:mod:`local ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. automodule:: gvaldap.settings.local -:py:mod:`gvaldap.settings.production` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +:py:mod:`production ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. automodule:: gvaldap.settings.production -:py:mod:`gvaldap.settings.test` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +:py:mod:`test ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. automodule:: gvaldap.settings.test - :py:mod:`ldapentities` app ========================== .. automodule:: ldapentities -:py:mod:`ldapenties.admin` --------------------------- +:py:mod:`admin ` +---------------------------------- .. automodule:: ldapentities.admin :members: -:py:mod:`ldapenties.models` ---------------------------- +:py:mod:`models ` +------------------------------------ .. automodule:: ldapentities.models :members: -:py:mod:`osusers` app -===================== +:py:mod:`ldaptasks` app +======================= -.. automodule:: osusers +.. automodule:: ldaptasks -:py:mod:`osusers.tasks` ------------------------ -.. automodule:: osusers.tasks +:py:mod:`tasks ` +--------------------------------- + +.. automodule:: ldaptasks.tasks :members: :undoc-members: From b75d41aaae5f2701c1b2442d2f38bc461284f29d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 19 Jan 2015 21:57:48 +0100 Subject: [PATCH 5/6] add changelog entry for tasks refactoring --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 3935cb1..c4f6d30 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :support:`-` move tasks from osusers to ldaptasks.tasks + * :release:`0.2.0 <2014-12-29>` * :feature:`-` add task :py:func:`osusers.tasks.delete_ldap_group` * :support:`-` use celery routers from gvacommon From fbbb5624fe74db4c4a552997ad429efbbf3e768d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 19 Jan 2015 22:15:42 +0100 Subject: [PATCH 6/6] update copyright years, add release version --- LICENSE.txt | 2 +- docs/changelog.rst | 1 + docs/conf.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 8c51745..96e8baa 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014 Jan Dittberner +Copyright (c) 2014, 2015 Jan Dittberner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/docs/changelog.rst b/docs/changelog.rst index c4f6d30..03031e3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,7 @@ Changelog ========= +* :release:`0.3.0 <2015-01-19>` * :support:`-` move tasks from osusers to ldaptasks.tasks * :release:`0.2.0 <2014-12-29>` diff --git a/docs/conf.py b/docs/conf.py index a02f850..77e3a10 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,16 +53,16 @@ master_doc = 'index' # General information about the project. project = u'gvaldap' -copyright = u'2014, Jan Dittberner' +copyright = u'2014, 2015 Jan Dittberner' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.2' +version = '0.3' # The full version, including alpha/beta/rc tags. -release = '0.2.0' +release = '0.3.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.