From 0aa3681320032c6456f4b9810c5ad236045b6100 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Tue, 30 Nov 2010 18:23:49 +0100 Subject: [PATCH] load virtualenv --- pandora/archive/models.py | 2 +- pandora/{api => item}/forms.py | 0 pandora/scripts/item_icon | 6 ++++++ pandora/scripts/list_icon | 6 ++++++ pandora/scripts/oxdb_poster | 6 ++++++ pandora/scripts/padma_poster | 6 ++++++ requirements.txt | 3 +-- 7 files changed, 26 insertions(+), 3 deletions(-) rename pandora/{api => item}/forms.py (100%) diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 894b24680..5b2d31808 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -59,7 +59,7 @@ class File(models.Model): episode = models.IntegerField(default=-1) size = models.BigIntegerField(default=0) - duration = models.IntegerField(default=0) + duration = models.BigIntegerField(default=0) info = fields.DictField(default={}) diff --git a/pandora/api/forms.py b/pandora/item/forms.py similarity index 100% rename from pandora/api/forms.py rename to pandora/item/forms.py diff --git a/pandora/scripts/item_icon b/pandora/scripts/item_icon index 31e4bb9b3..bb881b1d8 100755 --- a/pandora/scripts/item_icon +++ b/pandora/scripts/item_icon @@ -1,6 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 +root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) + +#using virtualenv's activate_this.py to reorder sys.path +activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') +execfile(activate_this, dict(__file__=activate_this)) + from __future__ import division import Image import ImageDraw diff --git a/pandora/scripts/list_icon b/pandora/scripts/list_icon index dcfa0d4bb..be9c337c3 100755 --- a/pandora/scripts/list_icon +++ b/pandora/scripts/list_icon @@ -1,6 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 +root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) + +#using virtualenv's activate_this.py to reorder sys.path +activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') +execfile(activate_this, dict(__file__=activate_this)) + from __future__ import division import Image import ImageDraw diff --git a/pandora/scripts/oxdb_poster b/pandora/scripts/oxdb_poster index f8c1f14af..d067fc2d6 100755 --- a/pandora/scripts/oxdb_poster +++ b/pandora/scripts/oxdb_poster @@ -1,6 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 +root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) + +#using virtualenv's activate_this.py to reorder sys.path +activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') +execfile(activate_this, dict(__file__=activate_this)) + from __future__ import division import Image import ImageDraw diff --git a/pandora/scripts/padma_poster b/pandora/scripts/padma_poster index 06c3a9509..eff439954 100755 --- a/pandora/scripts/padma_poster +++ b/pandora/scripts/padma_poster @@ -1,6 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 +root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) + +#using virtualenv's activate_this.py to reorder sys.path +activate_this = os.path.join(root_dir, 'bin', 'activate_this.py') +execfile(activate_this, dict(__file__=activate_this)) + from __future__ import division import Image import ImageDraw diff --git a/requirements.txt b/requirements.txt index 39b4209f3..210374524 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,7 @@ South -e bzr+http://code.0x2620.org/python-ox/#egg=python-ox -e bzr+http://code.0x2620.org/oxtimeline/#egg=oxtimeline simplejson -#-e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields -#rabbitmq interface +-e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields celery>2.1.1 django-celery>2.1.1 django_extensions