Changeset 11288:4e6cc71ae208 in orange


Ignore:
Timestamp:
01/29/13 12:08:47 (15 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Children:
11290:fff4c45473e8, 11291:c5fb32b6d8a4
Parents:
11287:92efd54a02fd (diff), 11088:1f5732de6ea2 (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:

Merged from biolab/orange

Files:
1085 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r11085 r11288  
    643643             all_with_extension(path="datasets", extensions=("tab", "csv", "basket")) +\ 
    644644             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    645         "Orange.OrangeCanvas": ["icons/*.png", "orngCanvas.pyw", "WidgetTabs.txt"], 
    646         "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", "report/index.html"], 
    647         "Orange.OrangeWidgets.Associate": ["icons/*.png"], 
    648         "Orange.OrangeWidgets.Classify": ["icons/*.png"], 
    649         "Orange.OrangeWidgets.Data": ["icons/*.png"], 
    650         "Orange.OrangeWidgets.Evaluate": ["icons/*.png"], 
    651         "Orange.OrangeWidgets.Prototypes": ["icons/*.png"], 
    652         "Orange.OrangeWidgets.Regression": ["icons/*.png"], 
    653         "Orange.OrangeWidgets.Unsupervised": ["icons/*.png"], 
    654         "Orange.OrangeWidgets.Visualize": ["icons/*.png"], 
    655         "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png"], 
     645        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
     646                                "orngCanvas.pyw", "WidgetTabs.txt"], 
     647        "Orange.OrangeCanvas.styles": ["*.qss", "orange/*.svg"], 
     648        "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", 
     649                                 "report/index.html"], 
     650        "Orange.OrangeWidgets.Associate": ["icons/*.png", "icons/*.svg"], 
     651        "Orange.OrangeWidgets.Classify": ["icons/*.png", "icons/*.svg"], 
     652        "Orange.OrangeWidgets.Data": ["icons/*.png", "icons/*.svg"], 
     653        "Orange.OrangeWidgets.Evaluate": ["icons/*.png", "icons/*.svg"], 
     654        "Orange.OrangeWidgets.Prototypes": ["icons/*.png", "icons/*.svg"], 
     655        "Orange.OrangeWidgets.Regression": ["icons/*.png", "icons/*.svg"], 
     656        "Orange.OrangeWidgets.Unsupervised": ["icons/*.png", "icons/*.svg"], 
     657        "Orange.OrangeWidgets.Visualize": ["icons/*.png", "icons/*.svg"], 
     658        "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png", "icons/*.svg"], 
    656659        "Orange.OrangeWidgets.plot": ["*.gs", "*.vs"], 
    657660        "Orange.OrangeWidgets.plot.primitives": ["*.obj"], 
     
    747750) 
    748751 
    749 # TODO: Use entry points for automatic script creation 
    750 # http://packages.python.org/distribute/setuptools.html#automatic-script-creation 
    751752ENTRY_POINTS = { 
     753    'gui_scripts': ( 
     754            'orange-canvas = Orange.OrangeCanvas.main:main', 
     755    ), 
     756    'orange.canvas.help': ( 
     757            'intersphinx = Orange.OrangeWidgets:intersphinx', 
     758    ) 
    752759} 
     760 
    753761 
    754762def setup_package(): 
     
    776784        zip_safe = False, 
    777785 
    778         # TODO: Should migrate those for distribute (using entry points) 
    779786        cmdclass = cmdclass, 
    780787        ext_modules = ext_modules, 
    781         scripts = ( 
    782             "bin/orange-canvas", 
    783         ), 
    784788    ) 
    785789 
  • setup.py

    r11264 r11288  
    3232NAME = 'Orange' 
    3333 
    34 VERSION = '2.6a2' 
     34VERSION = '2.6.1' 
    3535ISRELEASED = False 
    3636 
     
    634634 
    635635# TODO: Simply replace with include_package_data = True and configure missed files in MANIFEST.in? 
     636 
     637#Marko 20120128: Removed "doc/style.css", "doc/widgets/*/*.*" from the package 
     638 
    636639def get_package_data(): 
    637640    package_data = { 
    638641        "Orange": 
    639             ["orangerc.cfg", "doc/style.css", "doc/widgets/*/*.*"] +\ 
    640              all_with_extension(path="doc/datasets", extensions=("tab", "csv", "basket")) +\ 
     642            ["orangerc.cfg" ] +\ 
     643             all_with_extension(path="datasets", extensions=("tab", "csv", "basket")) +\ 
    641644             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    642645        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
Note: See TracChangeset for help on using the changeset viewer.