reactivate 'django-processinfo'

jedie · Mar 9, 2018 · 3e94b7c · 3e94b7c
1 parent 0eacd61
commit 3e94b7c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/README.creole b/README.creole
@@ -232,6 +232,8 @@ Older changes are here: https://www.pylucid.org/de/blog/tag/backward-incompatibl
 == Release History
 
 * [[https://github.com/jedie/PyLucid/compare/v3.1.0...master|compare v3.1.0...master]] **dev**
+* [[https://github.com/jedie/PyLucid/compare/v3.1.0...v3.1.1|09.03.2018 - v3.1.1]]:
+** reactivate [[https://github.com/jedie/django-processinfo/|django-processinfo]]
 * [[https://github.com/jedie/PyLucid/compare/v3.0.2...v3.1.0|09.03.2018 - v3.1.0]]:
 ** colorize pylucid boot/admin output
 ** update twitter bootstrap v3 with v4

diff --git a/pylucid/base_settings.py b/pylucid/base_settings.py
@@ -73,6 +73,8 @@
     'meta', # https://github.com/nephila/django-meta
     'djangocms_blog',
 
+    # https://github.com/jedie/django-processinfo
+    "django_processinfo",
 
     # https://github.com/jedie/django-cms-tools/
     'django_cms_tools',
@@ -91,6 +93,7 @@
 WSGI_APPLICATION = 'pylucid_page_instance.wsgi.application'
 
 MIDDLEWARE = (
+    "django_processinfo.middlewares.ProcessInfoMiddleware",
     'django.middleware.cache.UpdateCacheMiddleware',
 
     # https://github.com/jazzband/django-debug-toolbar/
@@ -263,6 +266,10 @@
 # MEDIA_ROOT =
 
 
+# https://github.com/jedie/django-processinfo
+from django_processinfo import app_settings as PROCESSINFO
+
+
 # https://django-debug-toolbar.readthedocs.io/en/stable/configuration.html#debug-toolbar-config
 from debug_toolbar.settings import CONFIG_DEFAULTS as DEBUG_TOOLBAR_CONFIG
 

diff --git a/pylucid/requirements/developer_installation.in b/pylucid/requirements/developer_installation.in
@@ -54,7 +54,7 @@ docutils
 
 # https://github.com/jedie/django-processinfo
 # https://pypi.org/project/django-processinfo
-#-e git+https://github.com/jedie/django-processinfo.git#egg=django-processinfo
+-e git+https://github.com/jedie/django-processinfo.git#egg=django-processinfo
 
 # https://github.com/jedie/django-reversion-compare
 # https://pypi.org/project/django-reversion-compare/

diff --git a/pylucid/requirements/developer_installation.txt b/pylucid/requirements/developer_installation.txt
@@ -9,6 +9,7 @@
 -e git+https://github.com/jedie/cmsplugin-pygments.git#egg=cmsplugin-pygments
 -e git+https://github.com/jedie/django-cms-tools.git@master#egg=django-cms-tools
 -e git+https://github.com/jedie/django-debug-toolbar-django-info.git#egg=django-debug-toolbar-django-info
+-e git+https://github.com/jedie/django-processinfo.git#egg=django-processinfo
 -e git+https://github.com/jedie/django-tools.git@master#egg=django-tools
 -e git+https://github.com/jedie/djangocms-text-ckeditor.git@update_html5lib#egg=djangocms-text-ckeditor
 -e git+https://github.com/jedie/djangocms-widgets.git#egg=djangocms-widgets

diff --git a/pylucid/requirements/normal_installation.in b/pylucid/requirements/normal_installation.in
@@ -25,7 +25,7 @@ django-tools
 django-cms-tools
 
 # https://pypi.org/project/django-processinfo
-#django-processinfo
+django-processinfo
 
 # https://pypi.org/project/django-reversion-compare/
 #django-reversion-compare>=0.6,<0.7

diff --git a/pylucid/requirements/normal_installation.txt b/pylucid/requirements/normal_installation.txt
@@ -25,6 +25,7 @@ django-meta==1.4.1        # via django-meta-mixin, djangocms-blog
 django-mptt==0.8.7        # via django-filer
 django-parler==1.9.2      # via djangocms-blog
 django-polymorphic==1.3   # via django-filer
+django-processinfo==0.8.0
 django-sekizai==0.10.0    # via cmsplugin-filer, django-cms, django-meta-mixin, djangocms-history
 django-sortedm2m==1.5.0   # via djangocms-blog
 django-taggit-autosuggest==0.3.2  # via djangocms-blog