From d8ace3034bc6a0f42207ffa7d93ba1cee8a80d58 Mon Sep 17 00:00:00 2001 From: Sean Myers Date: Thu, 8 Dec 2016 21:14:29 -0500 Subject: [PATCH] Separate dev and docs requirements from setup.py --- app/pulp/app/settings.py | 17 +++++++++++++++-- app/setup.py | 2 -- dev_requirements.txt | 4 ++++ docs/requirements.txt | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 dev_requirements.txt create mode 100644 docs/requirements.txt diff --git a/app/pulp/app/settings.py b/app/pulp/app/settings.py index 4c85896245..e3595641a3 100644 --- a/app/pulp/app/settings.py +++ b/app/pulp/app/settings.py @@ -12,6 +12,7 @@ import os import sys +from importlib import import_module import yaml @@ -44,9 +45,7 @@ 'django.contrib.staticfiles', # third-party 'django_filters', - 'crispy_forms', 'rest_framework', - 'django_extensions', # pulp platform app 'pulp.app', ] @@ -64,6 +63,20 @@ # add it to INSTALLED_APPS. :) INSTALLED_APPS.append(plugin) +# Optional apps that help with development, or augment Pulp in some non-critical way +OPTIONAL_APPS = [ + 'crispy_forms', + 'django_extensions', +] + +for app in OPTIONAL_APPS: + try: + import_module(app) + INSTALLED_APPS.append(app) + except ImportError: + # app module not installed + pass + MIDDLEWARE_CLASSES = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', diff --git a/app/setup.py b/app/setup.py index 4a0d17b146..8ddc3f2e3d 100755 --- a/app/setup.py +++ b/app/setup.py @@ -4,8 +4,6 @@ 'celery', 'coreapi', 'Django>=1.8,<1.9', - 'django-crispy-forms', - 'django-extensions', 'django-filter', 'djangorestframework', 'psycopg2', diff --git a/dev_requirements.txt b/dev_requirements.txt new file mode 100644 index 0000000000..de5987b744 --- /dev/null +++ b/dev_requirements.txt @@ -0,0 +1,4 @@ +# python packages handy for developers, but not required by pulp +django-crispy-forms +django-extensions +ipython diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000000..cbf1e3658e --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +sphinx +sphinx-rtd-theme