Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Alain Shakour
clowdflows
Commits
fc3f277f
Commit
fc3f277f
authored
Nov 20, 2012
by
Anze Vavpetic
Browse files
Merge branch 'dev' of workflow.ijs.si:mothra into dev
Conflicts: mothra/settings.py
parents
9712d6fd
22221f4d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
mothra/settings.py
View file @
fc3f277f
...
...
@@ -198,6 +198,7 @@ else:
'workflows.bioinformatics'
,
'workflows.subgroup_discovery'
,
'workflows.nlp'
,
'workflows.base'
,
'website'
,
'signuplogin'
,
'django_extensions'
,
...
...
workflows/base/__init__.py
0 → 100644
View file @
fc3f277f
workflows/base/db/package_data.json
0 → 100644
View file @
fc3f277f
This diff is collapsed.
Click to expand it.
workflows/management/commands/import_package.py
View file @
fc3f277f
from
django.core.management.base
import
BaseCommand
,
CommandError
from
workflows.models
import
Category
,
AbstractWidget
,
AbstractInput
,
AbstractOutput
,
AbstractOption
from
django.core
import
serializers
from
collections
import
Counter
#dirty python2.6 fix
try
:
from
collections
import
Counter
except
:
def
Counter
(
list
):
return
set
(
list
)
from
optparse
import
make_option
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment