Commit 227ff4a7 authored by Anze Vavpetic's avatar Anze Vavpetic

merge

parents f1d4864b c28eaba0
This file is placed here by pip to indicate the source was put
here by pip.
Once this package is successfully installed this source code will be
deleted (unless you remove this file).
......@@ -160,8 +160,7 @@ except NameError:
except ImportError:
pass
if USE_CONCURRENCY:
INSTALLED_APPS = (
INSTALLED_APPS_DEFAULT = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
......@@ -170,48 +169,41 @@ if USE_CONCURRENCY:
'django.contrib.staticfiles',
'django.contrib.admin',
'south',
'workflows',
'workflows.latino',
'workflows.decision_support',
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'workflows.ilp',
'workflows.mysql',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
'orderable_inlines',
'workflows',
)
INSTALLED_APPS_CONCUR = (
'djcelery',
) if USE_CONCURRENCY else (
'streams',
)
else:
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'south',
'workflows',
INSTALLED_APPS_WORKFLOWS_SUB = (
'workflows.base',
'workflows.latino',
'workflows.decision_support',
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'workflows.nl_toolkit',
'workflows.ilp',
'workflows.mysql',
'workflows.base',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
'orderable_inlines',
'streams',
'workflows.weka',
'workflows.cforange',
'workflows.perfeval',
'workflows.mysql'
#WORKFLOWS_SUBAPP_PLACEHOLDER
)
INSTALLED_APPS = \
INSTALLED_APPS_DEFAULT +\
INSTALLED_APPS_CONCUR +\
INSTALLED_APPS_WORKFLOWS_SUB
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS
TEMPLATES_FOLDER = os.path.join(PROJECT_DIR, 'templates')
......@@ -226,3 +218,4 @@ LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/'
STATIC_DOC_ROOT = os.path.join(os.getcwd(), 'mothra/public/media')
......@@ -7,4 +7,5 @@ django-extensions==0.9
django-orderable-inlines==0.0.6
django-picklefield==0.2.1
httplib2==0.7.5
pydot==1.0.28
wsgiref==0.1.2
[
{
"pk": 1,
"pk": 5,
"model": "workflows.category",
"fields": {
"uid": "bbf1e628-8be6-4178-8d93-765de278c0e4",
......@@ -12,10 +12,10 @@
}
},
{
"pk": 4,
"pk": 21,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"category": 5,
"treeview_image": "treeview/File.png",
"name": "File to string",
"is_streaming": false,
......@@ -37,10 +37,10 @@
}
},
{
"pk": 10,
"pk": 68,
"model": "workflows.abstractinput",
"fields": {
"widget": 4,
"widget": 21,
"name": "File",
"short_name": "fil",
"uid": "81742f96-f3c3-470a-af08-8afc54b6ff30",
......@@ -55,10 +55,10 @@
}
},
{
"pk": 7,
"pk": 26,
"model": "workflows.abstractoutput",
"fields": {
"widget": 4,
"widget": 21,
"name": "String",
"short_name": "str",
"variable": "string",
......@@ -68,10 +68,10 @@
}
},
{
"pk": 8,
"pk": 22,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"category": 5,
"treeview_image": "treeview/Upload-icon.png",
"name": "Load file",
"is_streaming": false,
......@@ -93,10 +93,10 @@
}
},
{
"pk": 9,
"pk": 69,
"model": "workflows.abstractinput",
"fields": {
"widget": 8,
"widget": 22,
"name": "File",
"short_name": "fil",
"uid": "d2b094de-d94c-4a7c-acbe-c21e5042183f",
......@@ -111,10 +111,10 @@
}
},
{
"pk": 6,
"pk": 27,
"model": "workflows.abstractoutput",
"fields": {
"widget": 8,
"widget": 22,
"name": "File",
"short_name": "fil",
"variable": "file",
......@@ -124,10 +124,10 @@
}
},
{
"pk": 12,
"pk": 23,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"category": 5,
"treeview_image": "treeview/Upload-icon_1.png",
"name": "Load file to string",
"is_streaming": false,
......@@ -149,10 +149,10 @@
}
},
{
"pk": 23,
"pk": 70,
"model": "workflows.abstractinput",
"fields": {
"widget": 12,
"widget": 23,
"name": "file",
"short_name": "fil",
"uid": "2de6ce93-0063-4770-a1d1-93fc2d98bccc",
......@@ -167,10 +167,10 @@
}
},
{
"pk": 15,
"pk": 28,
"model": "workflows.abstractoutput",
"fields": {
"widget": 12,
"widget": 23,
"name": "string",
"short_name": "str",
"variable": "string",
......@@ -180,10 +180,10 @@
}
},
{
"pk": 15,
"pk": 24,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"category": 5,
"treeview_image": "treeview/1688041475.png",
"name": "String to file",
"is_streaming": false,
......@@ -205,10 +205,10 @@
}
},
{
"pk": 15,
"pk": 71,
"model": "workflows.abstractinput",
"fields": {
"widget": 15,
"widget": 24,
"name": "String",
"short_name": "str",
"uid": "c658923a-a611-414b-ba7e-510aaa83ff19",
......@@ -223,7 +223,7 @@
}
},
{
"pk": 2,
"pk": 6,
"model": "workflows.category",
"fields": {
"uid": "9b145e48-9cc0-4a24-9ac7-0df48e879361",
......@@ -235,10 +235,10 @@
}
},
{
"pk": 1,
"pk": 25,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "treeview/d914a910.png",
"name": "Add integers",
"is_streaming": false,
......@@ -260,10 +260,10 @@
}
},
{
"pk": 2,
"pk": 72,
"model": "workflows.abstractinput",
"fields": {
"widget": 1,
"widget": 25,
"name": "Integer 1",
"short_name": "int",
"uid": "d46b4d0e-cc22-48f9-9947-4bbb754d8991",
......@@ -278,10 +278,10 @@
}
},
{
"pk": 3,
"pk": 73,
"model": "workflows.abstractinput",
"fields": {
"widget": 1,
"widget": 25,
"name": "Integer 2",
"short_name": "int",
"uid": "0bd80a21-e628-48c6-b3d8-58e8121e4711",
......@@ -296,10 +296,10 @@
}
},
{
"pk": 2,
"pk": 29,
"model": "workflows.abstractoutput",
"fields": {
"widget": 1,
"widget": 25,
"name": "Integer",
"short_name": "int",
"variable": "integer",
......@@ -309,10 +309,10 @@
}
},
{
"pk": 5,
"pk": 26,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "treeview/d914a910_2.png",
"name": "Add multiple integers",
"is_streaming": false,
......@@ -334,10 +334,10 @@
}
},
{
"pk": 6,
"pk": 74,
"model": "workflows.abstractinput",
"fields": {
"widget": 5,
"widget": 26,
"name": "Integer List",
"short_name": "int",
"uid": "aa8cdbe8-041b-455e-b03c-30d662f34c7b",
......@@ -352,10 +352,10 @@
}
},
{
"pk": 4,
"pk": 30,
"model": "workflows.abstractoutput",
"fields": {
"widget": 5,
"widget": 26,
"name": "Sum",
"short_name": "sum",
"variable": "sum",
......@@ -365,10 +365,10 @@
}
},
{
"pk": 9,
"pk": 27,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "treeview/417px-Latex_integers.svg.png",
"name": "Create Integer",
"is_streaming": false,
......@@ -390,10 +390,10 @@
}
},
{
"pk": 1,
"pk": 75,
"model": "workflows.abstractinput",
"fields": {
"widget": 9,
"widget": 27,
"name": "Type your integer",
"short_name": "int",
"uid": "1e52e44e-94cc-4666-8278-04da49d8f890",
......@@ -408,10 +408,10 @@
}
},
{
"pk": 1,
"pk": 31,
"model": "workflows.abstractoutput",
"fields": {
"widget": 9,
"widget": 27,
"name": "Integer",
"short_name": "int",
"variable": "integer",
......@@ -421,10 +421,10 @@
}
},
{
"pk": 14,
"pk": 28,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "",
"name": "Filter integers",
"is_streaming": false,
......@@ -446,10 +446,10 @@
}
},
{
"pk": 8,
"pk": 76,
"model": "workflows.abstractinput",
"fields": {
"widget": 14,
"widget": 28,
"name": "Integer List",
"short_name": "int",
"uid": "7358ad8b-b3e7-4d19-98e1-749444b6686d",
......@@ -464,10 +464,10 @@
}
},
{
"pk": 5,
"pk": 32,
"model": "workflows.abstractoutput",
"fields": {
"widget": 14,
"widget": 28,
"name": "Integer list",
"short_name": "int",
"variable": "integers",
......@@ -477,10 +477,10 @@
}
},
{
"pk": 16,
"pk": 29,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "",
"name": "Multiply integers",
"is_streaming": false,
......@@ -502,10 +502,10 @@
}
},
{
"pk": 22,
"pk": 77,
"model": "workflows.abstractinput",
"fields": {
"widget": 16,
"widget": 29,
"name": "Integers",
"short_name": "int",
"uid": "258f48ec-bbd1-4adc-85bb-97d43e73debe",
......@@ -520,10 +520,10 @@
}
},
{
"pk": 12,
"pk": 33,
"model": "workflows.abstractoutput",
"fields": {
"widget": 16,
"widget": 29,
"name": "Integer",
"short_name": "int",
"variable": "integer",
......@@ -533,10 +533,10 @@
}
},
{
"pk": 19,
"pk": 30,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"category": 6,
"treeview_image": "treeview/d914a910_1.png",
"name": "Subtract integers",
"is_streaming": false,
......@@ -558,10 +558,10 @@
}
},
{
"pk": 4,
"pk": 78,
"model": "workflows.abstractinput",
"fields": {
"widget": 19,
"widget": 30,
"name": "Integer 1",
"short_name": "int",
"uid": "77312adf-6969-407e-90bd-083c96d3983b",
......@@ -576,10 +576,10 @@
}
},
{
"pk": 5,
"pk": 79,
"model": "workflows.abstractinput",
"fields": {
"widget": 19,
"widget": 30,
"name": "Integer 2",
"short_name": "int",
"uid": "10fdef7a-7c55-464d-bd7d-1e273759eda9",
......@@ -594,10 +594,10 @@
}
},
{
"pk": 3,
"pk": 34,
"model": "workflows.abstractoutput",
"fields": {
"widget": 19,
"widget": 30,
"name": "Integer",
"short_name": "int",
"variable": "integer",
......@@ -607,7 +607,7 @@
}
},
{
"pk": 3,
"pk": 7,
"model": "workflows.category",
"fields": {
"uid": "01ad639d-acb8-45c0-bc5e-bc8739bb4c95",
......@@ -619,10 +619,66 @@
}
},
{
"pk": 3,
"pk": 98,
"model": "workflows.abstractwidget",
"fields": {
"category": 7,
"treeview_image": "",
"name": "Concatenate lists",
"is_streaming": false,
"uid": "42847b88-dc6b-4ced-942a-ad0ab25f3517",
"interaction_view": "",
"image": "",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "base_concatenate_lists",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 1,
"description": ""
}
},
{
"pk": 188,
"model": "workflows.abstractinput",
"fields": {
"widget": 98,
"name": "Lists",
"short_name": "lst",
"uid": "e4c412d3-b6b0-438e-8ec8-5362c6de5223",
"default": "",
"required": false,
"multi": true,
"parameter_type": null,
"variable": "lists",
"parameter": false,
"order": 1,
"description": ""
}
},
{
"pk": 110,
"model": "workflows.abstractoutput",
"fields": {
"widget": 98,
"name": "List",
"short_name": "lst",
"variable": "list",
"uid": "75dd2246-5b92-4119-9e04-0daed307d099",
"order": 1,
"description": ""
}
},
{
"pk": 31,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"category": 7,
"treeview_image": "treeview/Task-List-icon.png",
"name": "Create List",
"is_streaming": false,
......@@ -644,10 +700,10 @@
}
},
{
"pk": 12,
"pk": 80,
"model": "workflows.abstractinput",
"fields": {
"widget": 3,
"widget": 31,
"name": "Element",
"short_name": "el",
"uid": "40d329ea-23e6-4217-9944-a43a9195bd54",
......@@ -662,10 +718,10 @@
}