Changeset 1663:6f48078a9554 in orange-bioinformatics


Ignore:
Timestamp:
05/21/12 15:40:50 (2 years ago)
Author:
mitar
Branch:
default
Parents:
1662:427f1876f3e6 (diff), 1659:32e069184b7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r1659 r1663  
    11#!/usr/bin/env python 
    22 
    3 import distribute_setup 
    4 distribute_setup.use_setuptools() 
     3try: 
     4    import distribute_setup 
     5    distribute_setup.use_setuptools() 
     6except ImportError: 
     7    # For documentation we load setup.py to get version 
     8    # so it does not matter if importing fails 
     9    pass 
    510 
    611import os 
     
    1015NAME = 'Orange-Bioinformatics' 
    1116 
    12 VERSION = '1.1a' 
     17VERSION = '2.5a1' 
    1318 
    1419DESCRIPTION = 'Orange Bioinformatics add-on for Orange data mining software package.' 
  • setup.py

    r1662 r1663  
    6363 
    6464SETUP_REQUIRES = ( 
    65     'distribute', 
     65    'setuptools', 
    6666) 
    6767 
    6868INSTALL_REQUIRES = ( 
    6969    'Orange', 
    70     'distribute', 
    71     'suds', 
     70    'setuptools', 
    7271    'numpy', 
    73     'requests', 
    74     'oasa', 
    75     'bkchem', 
    76     'PIL', 
    77     'networkx', 
    78     'pygraphviz', 
    7972    # Dependencies which are problematic to install automatically 
    8073    #'openbabel-python', # You get bindings together with the openbabel library and not stand-alone 
     
    8881        #'PyQt', # No setup.py 
    8982    ), 
     83    'MOL_DEPICT': ( 
     84        'oasa' 
     85    ), 
     86    'NETWORK': ( 
     87        'Orange[NETWORK]' 
     88    ), 
     89    'KEGG': ( 
     90        'suds' 
     91    ) 
     92 
    9093} 
    9194 
    9295DEPENDENCY_LINKS = ( 
    93     'http://bkchem.zirael.org/download/bkchem-0.13.0.tar.gz', 
    94     'http://orange.biolab.si/download/bkchem-0.13.0.tar.gz', 
     96#    'http://bkchem.zirael.org/download/bkchem-0.13.0.tar.gz', 
     97#    'http://orange.biolab.si/download/bkchem-0.13.0.tar.gz', 
    9598    'http://bkchem.zirael.org/download/oasa-0.13.1.tar.gz', 
    9699    'http://orange.biolab.si/download/oasa-0.13.1.tar.gz', 
Note: See TracChangeset for help on using the changeset viewer.