Separating jenkins requirements and settings from the rest of the app.

This commit is contained in:
Isaac Bythewood
2012-05-10 02:12:30 +00:00
parent 02d9a34212
commit bd6647649a
5 changed files with 34 additions and 16 deletions

View File

@@ -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 $ git clone git://github.com/overshard/pinry.git
$ cd pinry $ cd pinry
$ virtualenv . $ virtualenv .
$ bin/pip install -r requirements.txt $ bin/pip install -r requirements/development.txt
$ bin/python manage.py syncdb $ bin/python manage.py syncdb
$ bin/python manage.py migrate $ bin/python manage.py migrate
$ bin/python manage.py runserver $ bin/python manage.py runserver

View File

@@ -49,12 +49,6 @@ MESSAGE_TAGS = {
messages.SUCCESS: 'alert alert-success', messages.SUCCESS: 'alert alert-success',
messages.INFO: 'alert alert-info', messages.INFO: 'alert alert-info',
} }
PROJECT_APPS = (
'pinry.vendor',
'pinry.core',
'pinry.pins',
'pinry.api',
)
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',
@@ -62,7 +56,6 @@ INSTALLED_APPS = (
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django_jenkins',
'south', 'south',
'pinry.vendor', 'pinry.vendor',
'pinry.core', 'pinry.core',

26
pinry/settings/jenkins.py Normal file
View File

@@ -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',
)

View File

@@ -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

View File

@@ -1,15 +1,10 @@
# django
Django==1.4 Django==1.4
# database
South==0.7.4 South==0.7.4
# imaging
PIL==1.1.7 PIL==1.1.7
git+git://github.com/vannoppen/django-thumbs.git@v1.0.0#egg=django-thumbs git+git://github.com/vannoppen/django-thumbs.git@v1.0.0#egg=django-thumbs
# jenkins
django-jenkins==0.12.1 django-jenkins==0.12.1
pylint==0.25.1
coverage==3.5.2 coverage==3.5.2
pylint==0.25.1
pep8==1.0.1
pyflakes==0.5.0