From 6108b14f27124a472cf62e420b919416183b9497 Mon Sep 17 00:00:00 2001 From: exploide Date: Tue, 2 May 2017 17:20:09 +0200 Subject: [PATCH 1/4] fixed NoReverseMatch error by extending from CMSAttachMenu instead of Menu --- pyBuchaktion/cms_menus.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyBuchaktion/cms_menus.py b/pyBuchaktion/cms_menus.py index 8701115..72ea150 100644 --- a/pyBuchaktion/cms_menus.py +++ b/pyBuchaktion/cms_menus.py @@ -1,10 +1,11 @@ -from menus.base import Menu, NavigationNode, Modifier +from cms.menu_bases import CMSAttachMenu +from menus.base import NavigationNode, Modifier from menus.menu_pool import menu_pool from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse from pyBuchaktion.models import Book, TucanModule, Order -class PyBuchaktionMenu(Menu): +class PyBuchaktionMenu(CMSAttachMenu): def get_nodes(self, request): From 1dcfd78dd2636101c2d09c202c895b4762bde03f Mon Sep 17 00:00:00 2001 From: exploide Date: Tue, 2 May 2017 17:26:06 +0200 Subject: [PATCH 2/4] improved deployment instructions in README fixes #33 --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d5eab67..2f23de5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The purpose of the app is to build an interface for participants of the Buchakti Development ---- Everyone with interest in helping us, should now that: -* for testing use the D120 Django CMS. +* for testing use the D120 Django CMS. * Read [this](https://github.com/d120/pyBuchaktion/wiki/Testing-with-D120-Django-CMS) for further instructions. * we have decided to use the workflow recommended by GitHub. This means: * new feature = new branch @@ -16,12 +16,16 @@ Everyone with interest in helping us, should now that: Documentation ---- -You can find information, a manual and furthermore in the Wiki of this project. +You can find information, a manual and furthermore in the Wiki of this project. Deployment ---------- -To use pyBuchaktion, you will need to configure [pyTUID](https://github.com/d120/pyTUID). As pip currently does not provide a preferred dependency resolution workflow for privately hosted projects, you'll need to start pip with `--process-dependency-links`. +Add `'pyTUID', 'import_export', 'pyBuchaktion'` to your `INSTALLED_APPS` setting. + +Note that you will also need to configure [pyTUID](https://github.com/d120/pyTUID). + +As pip currently does not provide a preferred dependency resolution workflow for git hosted projects, you'll need to start pip with `--process-dependency-links`. License ---- From 353132326c3ddb92c55e735c9b4a79eef57a72da Mon Sep 17 00:00:00 2001 From: exploide Date: Tue, 2 May 2017 17:32:54 +0200 Subject: [PATCH 3/4] added name for buchaktion menu --- pyBuchaktion/cms_menus.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyBuchaktion/cms_menus.py b/pyBuchaktion/cms_menus.py index 72ea150..4c202af 100644 --- a/pyBuchaktion/cms_menus.py +++ b/pyBuchaktion/cms_menus.py @@ -7,6 +7,8 @@ class PyBuchaktionMenu(CMSAttachMenu): + name = _("Buchaktion Menu") + def get_nodes(self, request): #n1 = NavigationNode(_('Buchaktion'), reverse('pyBuchaktion:index'), 1) From 4a07d7347f0b0e6c1724e54ffec9ab21adbe6961 Mon Sep 17 00:00:00 2001 From: exploide Date: Tue, 2 May 2017 18:08:38 +0200 Subject: [PATCH 4/4] make use of MANIFEST.in to include templates and other stuff in build process --- MANIFEST.in | 4 ++++ setup.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..90a404d --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include LICENSE +include README.md +recursive-include pyBuchaktion/templates * +recursive-include pyBuchaktion/locale * diff --git a/setup.py b/setup.py index 22aa02d..686c505 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,6 @@ def run(self): version='0.1', packages=find_packages(), include_package_data=True, - package_data={'': ['locale/*/LC_MESSAGES/*.po']}, license='AGPL-3.0', description='App for the Buchaktion', #long_description=README,