From e38385fcd85a85aa827e01d623c074f3f235f4e9 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 9 Oct 2009 17:20:54 +0200 Subject: [PATCH] move files for new virtualenv setup --- .bzrignore | 7 +++++-- README | 17 +++++++++++++++++ {lookup => oxdata/lookup}/__init__.py | 0 {lookup => oxdata/lookup}/admin.py | 0 {lookup => oxdata/lookup}/cache.py | 0 .../lookup}/management/__init__.py | 0 .../lookup}/management/commands/__init__.py | 0 .../lookup}/management/commands/cache_ids.py | 0 .../lookup}/migrations/0001_initial.py | 0 .../lookup}/migrations/__init__.py | 0 {lookup => oxdata/lookup}/models.py | 0 {lookup => oxdata/lookup}/urls.py | 0 {lookup => oxdata/lookup}/views.py | 0 manage.py => oxdata/manage.py | 0 {poster => oxdata/poster}/__init__.py | 0 {poster => oxdata/poster}/admin.py | 0 .../poster}/migrations/0001_initial.py | 0 .../poster}/migrations/__init__.py | 0 {poster => oxdata/poster}/models.py | 0 {poster => oxdata/poster}/urls.py | 0 {poster => oxdata/poster}/views.py | 0 settings.py => oxdata/settings.py | 0 {static => oxdata/static}/js/jquery.js | 0 .../templates}/admin/base_site.html | 0 {templates => oxdata/templates}/index.html | 0 {templates => oxdata/templates}/poster.html | 0 urls.py => oxdata/urls.py | 0 {utils => oxdata/utils}/__init__.py | 0 monitor.py => oxdata/utils/monitor.py | 0 {utils => oxdata/utils}/shortcuts.py | 0 views.py => oxdata/views.py | 0 requirements.txt | 4 ++++ wsgi/django.wsgi | 4 ++-- 33 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 README rename {lookup => oxdata/lookup}/__init__.py (100%) rename {lookup => oxdata/lookup}/admin.py (100%) rename {lookup => oxdata/lookup}/cache.py (100%) rename {lookup => oxdata/lookup}/management/__init__.py (100%) rename {lookup => oxdata/lookup}/management/commands/__init__.py (100%) rename {lookup => oxdata/lookup}/management/commands/cache_ids.py (100%) rename {lookup => oxdata/lookup}/migrations/0001_initial.py (100%) rename {lookup => oxdata/lookup}/migrations/__init__.py (100%) rename {lookup => oxdata/lookup}/models.py (100%) rename {lookup => oxdata/lookup}/urls.py (100%) rename {lookup => oxdata/lookup}/views.py (100%) rename manage.py => oxdata/manage.py (100%) rename {poster => oxdata/poster}/__init__.py (100%) rename {poster => oxdata/poster}/admin.py (100%) rename {poster => oxdata/poster}/migrations/0001_initial.py (100%) rename {poster => oxdata/poster}/migrations/__init__.py (100%) rename {poster => oxdata/poster}/models.py (100%) rename {poster => oxdata/poster}/urls.py (100%) rename {poster => oxdata/poster}/views.py (100%) rename settings.py => oxdata/settings.py (100%) rename {static => oxdata/static}/js/jquery.js (100%) rename {templates => oxdata/templates}/admin/base_site.html (100%) rename {templates => oxdata/templates}/index.html (100%) rename {templates => oxdata/templates}/poster.html (100%) rename urls.py => oxdata/urls.py (100%) rename {utils => oxdata/utils}/__init__.py (100%) rename monitor.py => oxdata/utils/monitor.py (100%) rename {utils => oxdata/utils}/shortcuts.py (100%) rename views.py => oxdata/views.py (100%) create mode 100644 requirements.txt diff --git a/.bzrignore b/.bzrignore index 404a9dd..cab8e2d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,8 +1,11 @@ data cache media -media/posters -host_settings +oxdata/media/posters dev.sqlite local_settings.py secret.txt +bin +lib +src +include diff --git a/README b/README new file mode 100644 index 0000000..f92000f --- /dev/null +++ b/README @@ -0,0 +1,17 @@ +To setup a local instance of oxdata: + + bzr branch http://code.0xdb.org/oxdata oxdata + cd oxdata + virtualenv . + pip -E . install -r requirements.txt + +you need python, bazaar, pip and virtualenv: + + apt-get install python-setuptools bzr + east_install pip + pip install virtualenv + +also it uses system python moduels, so make sure you have + ipython, dbmodule(psycopg2, python-mysqldb,..) +installed via apt-get/pip/easy_install in your system path. + diff --git a/lookup/__init__.py b/oxdata/lookup/__init__.py similarity index 100% rename from lookup/__init__.py rename to oxdata/lookup/__init__.py diff --git a/lookup/admin.py b/oxdata/lookup/admin.py similarity index 100% rename from lookup/admin.py rename to oxdata/lookup/admin.py diff --git a/lookup/cache.py b/oxdata/lookup/cache.py similarity index 100% rename from lookup/cache.py rename to oxdata/lookup/cache.py diff --git a/lookup/management/__init__.py b/oxdata/lookup/management/__init__.py similarity index 100% rename from lookup/management/__init__.py rename to oxdata/lookup/management/__init__.py diff --git a/lookup/management/commands/__init__.py b/oxdata/lookup/management/commands/__init__.py similarity index 100% rename from lookup/management/commands/__init__.py rename to oxdata/lookup/management/commands/__init__.py diff --git a/lookup/management/commands/cache_ids.py b/oxdata/lookup/management/commands/cache_ids.py similarity index 100% rename from lookup/management/commands/cache_ids.py rename to oxdata/lookup/management/commands/cache_ids.py diff --git a/lookup/migrations/0001_initial.py b/oxdata/lookup/migrations/0001_initial.py similarity index 100% rename from lookup/migrations/0001_initial.py rename to oxdata/lookup/migrations/0001_initial.py diff --git a/lookup/migrations/__init__.py b/oxdata/lookup/migrations/__init__.py similarity index 100% rename from lookup/migrations/__init__.py rename to oxdata/lookup/migrations/__init__.py diff --git a/lookup/models.py b/oxdata/lookup/models.py similarity index 100% rename from lookup/models.py rename to oxdata/lookup/models.py diff --git a/lookup/urls.py b/oxdata/lookup/urls.py similarity index 100% rename from lookup/urls.py rename to oxdata/lookup/urls.py diff --git a/lookup/views.py b/oxdata/lookup/views.py similarity index 100% rename from lookup/views.py rename to oxdata/lookup/views.py diff --git a/manage.py b/oxdata/manage.py similarity index 100% rename from manage.py rename to oxdata/manage.py diff --git a/poster/__init__.py b/oxdata/poster/__init__.py similarity index 100% rename from poster/__init__.py rename to oxdata/poster/__init__.py diff --git a/poster/admin.py b/oxdata/poster/admin.py similarity index 100% rename from poster/admin.py rename to oxdata/poster/admin.py diff --git a/poster/migrations/0001_initial.py b/oxdata/poster/migrations/0001_initial.py similarity index 100% rename from poster/migrations/0001_initial.py rename to oxdata/poster/migrations/0001_initial.py diff --git a/poster/migrations/__init__.py b/oxdata/poster/migrations/__init__.py similarity index 100% rename from poster/migrations/__init__.py rename to oxdata/poster/migrations/__init__.py diff --git a/poster/models.py b/oxdata/poster/models.py similarity index 100% rename from poster/models.py rename to oxdata/poster/models.py diff --git a/poster/urls.py b/oxdata/poster/urls.py similarity index 100% rename from poster/urls.py rename to oxdata/poster/urls.py diff --git a/poster/views.py b/oxdata/poster/views.py similarity index 100% rename from poster/views.py rename to oxdata/poster/views.py diff --git a/settings.py b/oxdata/settings.py similarity index 100% rename from settings.py rename to oxdata/settings.py diff --git a/static/js/jquery.js b/oxdata/static/js/jquery.js similarity index 100% rename from static/js/jquery.js rename to oxdata/static/js/jquery.js diff --git a/templates/admin/base_site.html b/oxdata/templates/admin/base_site.html similarity index 100% rename from templates/admin/base_site.html rename to oxdata/templates/admin/base_site.html diff --git a/templates/index.html b/oxdata/templates/index.html similarity index 100% rename from templates/index.html rename to oxdata/templates/index.html diff --git a/templates/poster.html b/oxdata/templates/poster.html similarity index 100% rename from templates/poster.html rename to oxdata/templates/poster.html diff --git a/urls.py b/oxdata/urls.py similarity index 100% rename from urls.py rename to oxdata/urls.py diff --git a/utils/__init__.py b/oxdata/utils/__init__.py similarity index 100% rename from utils/__init__.py rename to oxdata/utils/__init__.py diff --git a/monitor.py b/oxdata/utils/monitor.py similarity index 100% rename from monitor.py rename to oxdata/utils/monitor.py diff --git a/utils/shortcuts.py b/oxdata/utils/shortcuts.py similarity index 100% rename from utils/shortcuts.py rename to oxdata/utils/shortcuts.py diff --git a/views.py b/oxdata/views.py similarity index 100% rename from views.py rename to oxdata/views.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2fbf133 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +-e svn+http://code.djangoproject.com/svn/django/branches/releases/1.1.X/#egg=django +South==0.6.1 +-e bzr+http://code.0xdb.org/python-oxlib/#egg=python-oxlib +-e bzr+http://code.0xdb.org/python-oxweb/#egg=python-oxweb diff --git a/wsgi/django.wsgi b/wsgi/django.wsgi index c4fa7dd..401707b 100644 --- a/wsgi/django.wsgi +++ b/wsgi/django.wsgi @@ -5,7 +5,7 @@ import site project_module = 'oxdata' -root_dir = os.path.normpath(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) +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, 'env', 'bin', 'activate_this.py') @@ -15,7 +15,7 @@ sys.path.append(root_dir) sys.path.append(os.path.join(root_dir, project_module)) #reload if this django.wsgi gets touched -import monitor +from utils import monitor monitor.start(interval=1.0) monitor.track(os.path.abspath(os.path.dirname(__file__)))