From 8a5bc0aa3e00f05fd0e56e07386b820fd20f13e3 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Tue, 20 Nov 2007 18:48:21 +0000 Subject: [PATCH] [project @ Moved ga_frontend to gaworkflow.frontend package.] * All the modules in the front end have been updated to be located in gaworkflow.frontend. * Requires that PYTHONPATH include top level directory or for the package to be installed as gaworkflow/frontend/manage.py only adds frontend/ to the python path, and therefore it will fail. * Changed the hard coded paths to be more like os.path.abspath('../../fctracker.db') so, the code should just work if the main package is available on the python path. (Good defaults are nice!) --- ga_frontend/eland_config/urls.py | 10 ---------- {ga_frontend => gaworkflow/frontend}/__init__.py | 0 .../frontend}/eland_config/__init__.py | 0 .../frontend}/eland_config/forms.py | 0 .../frontend}/eland_config/models.py | 0 gaworkflow/frontend/eland_config/urls.py | 10 ++++++++++ .../frontend}/eland_config/views.py | 6 +++--- .../frontend}/fctracker/__init__.py | 0 .../frontend}/fctracker/models.py | 2 +- .../frontend}/fctracker/views.py | 0 {ga_frontend => gaworkflow/frontend}/manage.py | 0 {ga_frontend => gaworkflow/frontend}/settings.py | 12 ++++++------ {ga_frontend => gaworkflow/frontend}/urls.py | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 ga_frontend/eland_config/urls.py rename {ga_frontend => gaworkflow/frontend}/__init__.py (100%) rename {ga_frontend => gaworkflow/frontend}/eland_config/__init__.py (100%) rename {ga_frontend => gaworkflow/frontend}/eland_config/forms.py (100%) rename {ga_frontend => gaworkflow/frontend}/eland_config/models.py (100%) create mode 100644 gaworkflow/frontend/eland_config/urls.py rename {ga_frontend => gaworkflow/frontend}/eland_config/views.py (99%) rename {ga_frontend => gaworkflow/frontend}/fctracker/__init__.py (100%) rename {ga_frontend => gaworkflow/frontend}/fctracker/models.py (99%) rename {ga_frontend => gaworkflow/frontend}/fctracker/views.py (100%) rename {ga_frontend => gaworkflow/frontend}/manage.py (100%) rename {ga_frontend => gaworkflow/frontend}/settings.py (90%) rename {ga_frontend => gaworkflow/frontend}/urls.py (83%) diff --git a/ga_frontend/eland_config/urls.py b/ga_frontend/eland_config/urls.py deleted file mode 100644 index 13d659b..0000000 --- a/ga_frontend/eland_config/urls.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.conf.urls.defaults import * - -urlpatterns = patterns('', - # Example: - - (r'^(?PFC\d+)/$', 'ga_frontend.eland_config.views.config'), - (r'^$', 'ga_frontend.eland_config.views.config'), - #(r'^$', 'ga_frontend.eland_config.views.index') - -) diff --git a/ga_frontend/__init__.py b/gaworkflow/frontend/__init__.py similarity index 100% rename from ga_frontend/__init__.py rename to gaworkflow/frontend/__init__.py diff --git a/ga_frontend/eland_config/__init__.py b/gaworkflow/frontend/eland_config/__init__.py similarity index 100% rename from ga_frontend/eland_config/__init__.py rename to gaworkflow/frontend/eland_config/__init__.py diff --git a/ga_frontend/eland_config/forms.py b/gaworkflow/frontend/eland_config/forms.py similarity index 100% rename from ga_frontend/eland_config/forms.py rename to gaworkflow/frontend/eland_config/forms.py diff --git a/ga_frontend/eland_config/models.py b/gaworkflow/frontend/eland_config/models.py similarity index 100% rename from ga_frontend/eland_config/models.py rename to gaworkflow/frontend/eland_config/models.py diff --git a/gaworkflow/frontend/eland_config/urls.py b/gaworkflow/frontend/eland_config/urls.py new file mode 100644 index 0000000..c5292ab --- /dev/null +++ b/gaworkflow/frontend/eland_config/urls.py @@ -0,0 +1,10 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('', + # Example: + + (r'^(?PFC\d+)/$', 'gaworkflow.frontend.eland_config.views.config'), + (r'^$', 'gaworkflow.frontend.eland_config.views.config'), + #(r'^$', 'gaworkflow.frontend.eland_config.views.index') + +) diff --git a/ga_frontend/eland_config/views.py b/gaworkflow/frontend/eland_config/views.py similarity index 99% rename from ga_frontend/eland_config/views.py rename to gaworkflow/frontend/eland_config/views.py index 596e0ff..994062a 100644 --- a/ga_frontend/eland_config/views.py +++ b/gaworkflow/frontend/eland_config/views.py @@ -2,9 +2,9 @@ from django.http import HttpResponse from django.shortcuts import render_to_response from django.core.exceptions import ObjectDoesNotExist -from ga_frontend.eland_config import forms -from ga_frontend import settings -from ga_frontend.fctracker import models +from gaworkflow.frontend.eland_config import forms +from gaworkflow.frontend import settings +from gaworkflow.frontend.fctracker import models import os import glob diff --git a/ga_frontend/fctracker/__init__.py b/gaworkflow/frontend/fctracker/__init__.py similarity index 100% rename from ga_frontend/fctracker/__init__.py rename to gaworkflow/frontend/fctracker/__init__.py diff --git a/ga_frontend/fctracker/models.py b/gaworkflow/frontend/fctracker/models.py similarity index 99% rename from ga_frontend/fctracker/models.py rename to gaworkflow/frontend/fctracker/models.py index 013f36b..a995462 100644 --- a/ga_frontend/fctracker/models.py +++ b/gaworkflow/frontend/fctracker/models.py @@ -1,5 +1,5 @@ from django.db import models -from ga_frontend import settings +from gaworkflow.frontend import settings # Create your models here. diff --git a/ga_frontend/fctracker/views.py b/gaworkflow/frontend/fctracker/views.py similarity index 100% rename from ga_frontend/fctracker/views.py rename to gaworkflow/frontend/fctracker/views.py diff --git a/ga_frontend/manage.py b/gaworkflow/frontend/manage.py similarity index 100% rename from ga_frontend/manage.py rename to gaworkflow/frontend/manage.py diff --git a/ga_frontend/settings.py b/gaworkflow/frontend/settings.py similarity index 90% rename from ga_frontend/settings.py rename to gaworkflow/frontend/settings.py index 65dbab3..fc79fb2 100644 --- a/ga_frontend/settings.py +++ b/gaworkflow/frontend/settings.py @@ -12,7 +12,7 @@ ADMINS = ( MANAGERS = ADMINS DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. -DATABASE_NAME = '/home/king/proj/ga_frontend/elandifier.db' # Or path to database file if using sqlite3. +DATABASE_NAME = os.path.abspath('../../fctracker.db') # Or path to database file if using sqlite3. DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. @@ -66,13 +66,13 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.doc.XViewMiddleware', ) -ROOT_URLCONF = 'ga_frontend.urls' +ROOT_URLCONF = 'gaworkflow.frontend.urls' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - "/home/king/proj/ga_frontend/templates" + os.path.abspath("../../templates") ) INSTALLED_APPS = ( @@ -81,13 +81,13 @@ INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', - 'ga_frontend.eland_config', - 'ga_frontend.fctracker', + 'gaworkflow.frontend.eland_config', + 'gaworkflow.frontend.fctracker', 'django.contrib.databrowse', ) # Project specific settings -UPLOADTO_HOME = '/home/king/proj/ga_frontend/uploads' +UPLOADTO_HOME = os.path.abspath('../../uploads') UPLOADTO_CONFIG_FILE = os.path.join(UPLOADTO_HOME, 'eland_config') UPLOADTO_ELAND_RESULT_PACKS = os.path.join(UPLOADTO_HOME, 'eland_results') UPLOADTO_BED_PACKS = os.path.join(UPLOADTO_HOME, 'bed_packs') diff --git a/ga_frontend/urls.py b/gaworkflow/frontend/urls.py similarity index 83% rename from ga_frontend/urls.py rename to gaworkflow/frontend/urls.py index 44f8121..0c67015 100644 --- a/ga_frontend/urls.py +++ b/gaworkflow/frontend/urls.py @@ -8,7 +8,7 @@ databrowse.site.register(FlowCell) urlpatterns = patterns('', # Base: - (r'^eland_config/', include('ga_frontend.eland_config.urls')), + (r'^eland_config/', include('gaworkflow.frontend.eland_config.urls')), # Admin: (r'^admin/', include('django.contrib.admin.urls')), # Databrowser: -- 2.30.2