From bd6647649a61a07be2ce2627d36b3ebcc73f912d Mon Sep 17 00:00:00 2001 From: Isaac Bythewood Date: Thu, 10 May 2012 02:12:30 +0000 Subject: [PATCH] Separating jenkins requirements and settings from the rest of the app. --- README.md | 2 +- pinry/settings/__init__.py | 7 ------ pinry/settings/jenkins.py | 26 ++++++++++++++++++++ requirements/development.txt | 4 +++ requirements.txt => requirements/jenkins.txt | 11 +++------ 5 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 pinry/settings/jenkins.py create mode 100644 requirements/development.txt rename requirements.txt => requirements/jenkins.txt (79%) diff --git a/README.md b/README.md index f47d2fb..fcfe3bb 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ dependencies for PIL installed. (If you are on Ubuntu you can do this by typing $ git clone git://github.com/overshard/pinry.git $ cd pinry $ virtualenv . - $ bin/pip install -r requirements.txt + $ bin/pip install -r requirements/development.txt $ bin/python manage.py syncdb $ bin/python manage.py migrate $ bin/python manage.py runserver diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py index f3ec535..0988c65 100644 --- a/pinry/settings/__init__.py +++ b/pinry/settings/__init__.py @@ -49,12 +49,6 @@ MESSAGE_TAGS = { messages.SUCCESS: 'alert alert-success', messages.INFO: 'alert alert-info', } -PROJECT_APPS = ( - 'pinry.vendor', - 'pinry.core', - 'pinry.pins', - 'pinry.api', -) INSTALLED_APPS = ( 'django.contrib.auth', @@ -62,7 +56,6 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_jenkins', 'south', 'pinry.vendor', 'pinry.core', diff --git a/pinry/settings/jenkins.py b/pinry/settings/jenkins.py new file mode 100644 index 0000000..7246e20 --- /dev/null +++ b/pinry/settings/jenkins.py @@ -0,0 +1,26 @@ +from pinry.settings import * + +import os + + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(SITE_ROOT, 'development.db'), + } +} + +SECRET_KEY = '' + + +INSTALLED_APPS += ('django_jenkins',) +PROJECT_APPS = ( + 'pinry.vendor', + 'pinry.core', + 'pinry.pins', + 'pinry.api', +) diff --git a/requirements/development.txt b/requirements/development.txt new file mode 100644 index 0000000..b6b40f7 --- /dev/null +++ b/requirements/development.txt @@ -0,0 +1,4 @@ +Django==1.4 +South==0.7.4 +PIL==1.1.7 +git+git://github.com/vannoppen/django-thumbs.git@v1.0.0#egg=django-thumbs diff --git a/requirements.txt b/requirements/jenkins.txt similarity index 79% rename from requirements.txt rename to requirements/jenkins.txt index e0beac9..afa6ffa 100644 --- a/requirements.txt +++ b/requirements/jenkins.txt @@ -1,15 +1,10 @@ -# django Django==1.4 - -# database South==0.7.4 - -# imaging PIL==1.1.7 git+git://github.com/vannoppen/django-thumbs.git@v1.0.0#egg=django-thumbs -# jenkins django-jenkins==0.12.1 -pylint==0.25.1 coverage==3.5.2 - +pylint==0.25.1 +pep8==1.0.1 +pyflakes==0.5.0