mitar avatar mitar committed 6f48078 Merge

Merge.

Comments (0)

Files changed (2)

_bioinformatics/widgets/OWPIPAx.py

 from datetime import date
 
 from Orange.orng import orngEnviron
-from Orange.OrangeWidgetsimport OWGUI
+from Orange.OrangeWidgets import OWGUI
 from Orange.OrangeWidgets.OWWidget import *
 
 from .. import obiDicty
 }
 
 SETUP_REQUIRES = (
-    'distribute',
+    'setuptools',
 )
 
 INSTALL_REQUIRES = (
     'Orange',
-    'distribute',
-    'suds',
+    'setuptools',
     'numpy',
-    'requests',
-    'oasa',
-    'bkchem',
-    'PIL',
-    'networkx',
-    'pygraphviz',
     # Dependencies which are problematic to install automatically
     #'openbabel-python', # You get bindings together with the openbabel library and not stand-alone
     #'scipy', # Requires Fortran compiler
         # Dependencies which are problematic to install automatically
         #'PyQt', # No setup.py
     ),
+    'MOL_DEPICT': (
+        'oasa'
+    ),
+    'NETWORK': (
+        'Orange[NETWORK]'
+    ),
+    'KEGG': (
+        'suds'
+    )
+
 }
 
 DEPENDENCY_LINKS = (
-    'http://bkchem.zirael.org/download/bkchem-0.13.0.tar.gz',
-    'http://orange.biolab.si/download/bkchem-0.13.0.tar.gz',
+#    'http://bkchem.zirael.org/download/bkchem-0.13.0.tar.gz',
+#    'http://orange.biolab.si/download/bkchem-0.13.0.tar.gz',
     'http://bkchem.zirael.org/download/oasa-0.13.1.tar.gz',
     'http://orange.biolab.si/download/oasa-0.13.1.tar.gz',
 )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.