Changeset 61f32d2b in sasview


Ignore:
Timestamp:
Feb 14, 2015 9:13:59 AM (9 years ago)
Author:
butler
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
66f21cd
Parents:
ad8872e (diff), a2b6e482 (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 branch 'master' of ​https://github.com/SasView/sasview.git

Files:
22 added
7 edited

Legend:

Unmodified
Added
Removed

  • build_tools/conda/bumps/meta.yaml

    rf479ac3 rb75079b  
    1 about: {home: 'http://www.reflectometry.org/danse/software.html', license: UNKNOWN, 
    2   summary: Data fitting with bayesian uncertainty analysis} 
    3 build: 
    4   entry_points: [] 
    5   features: [] 
    6   string: '' 
    7   track_features: [] 
    8 package: {name: bumps, version: 0.7.5.3} 
     1package: 
     2  name: bumps 
     3  version: !!str 0.7.5.4 
     4 
     5source: 
     6  fn: bumps-0.7.5.4.tar.gz 
     7  url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.4.tar.gz 
     8  md5: a47c035fbb18afa5ca53067506a5ff1c 
     9#  patches: 
     10   # List any patch files here 
     11   # - fix.patch 
     12 
     13# build: 
     14  #preserve_egg_dir: True 
     15  #entry_points: 
     16    # Put any entry points (scripts to be generated automatically) here. The 
     17    # syntax is module:function.  For example 
     18    # 
     19    # - bumps = bumps:main 
     20    # 
     21    # Would create an entry point called bumps that calls bumps.main() 
     22 
     23 
     24  # If this is a new build for the same version, increment the build 
     25  # number. If you do not include this key, it defaults to 0. 
     26  # number: 1 
     27 
    928requirements: 
    10   build: [python, setuptools, six] 
    11   conflicts: [] 
    12   run: [python, six] 
    13 source: 
    14   fn: bumps-0.7.5.3.tar.gz 
    15   git_rev: '' 
    16   md5: f17b41412c3c8ad6432a42e42cb926d5 
    17   patches: [] 
    18   path: '' 
    19   svn_rev: '' 
    20   url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.3.tar.gz 
     29  build: 
     30    - python 
     31    - setuptools 
     32    - six 
     33 
     34  run: 
     35    - python 
     36    - six 
     37 
    2138test: 
    22   commands: [] 
    23   files: [] 
    24   imports: [bumps, bumps.dream, bumps.gui, bumps.gui.resources, bumps.mystic, bumps.mystic.examples, 
    25     bumps.mystic.optimizer] 
    26   requires: [] 
     39  # Python imports 
     40  imports: 
     41    - bumps 
     42    - bumps.dream 
     43    - bumps.gui 
     44    - bumps.gui.resources 
     45    - bumps.mystic 
     46    - bumps.mystic.examples 
     47    - bumps.mystic.optimizer 
     48 
     49  #commands: 
     50    # You can put test commands to be run here.  Use this to test that the 
     51    # entry points work. 
     52 
     53 
     54  # You can also put a file called run_test.py in the recipe that will be run 
     55  # at test time. 
     56 
     57  requires: 
     58   - numpy 
     59   - scipy 
     60   - matplotlib 
     61 
     62about: 
     63  home: http://www.reflectometry.org/danse/software.html 
     64  license: UNKNOWN 
     65  summary: 'Data fitting with bayesian uncertainty analysis' 
     66 
     67# See 
     68# http://docs.continuum.io/conda/build.html for 
     69# more information about meta.yaml 

  • build_tools/conda/periodictable/meta.yaml

    rf479ac3 r55bde35  
    1 about: {home: 'http://www.reflectometry.org/danse/elements.html', license: public 
    2     domain, summary: Extensible periodic table of the elements} 
    3 build: 
    4   entry_points: [] 
    5   features: [] 
    6   string: '' 
    7   track_features: [] 
    8 package: {name: periodictable, version: 1.4.1} 
    9 requirements: 
    10   build: [python, setuptools, pyparsing, numpy] 
    11   conflicts: [] 
    12   run: [python, pyparsing, numpy] 
     1package: 
     2  name: periodictable 
     3  version: !!str 1.4.1 
     4 
    135source: 
    146  fn: periodictable-1.4.1.tar.gz 
    15   git_rev: '' 
     7  url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz 
    168  md5: 7246b63cc0b6b1be6e86b6616f9e866e 
    17   patches: [] 
    18   path: '' 
    19   svn_rev: '' 
    20   url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz 
     9#  patches: 
     10   # List any patch files here 
     11   # - fix.patch 
     12 
     13# build: 
     14  #preserve_egg_dir: True 
     15  #entry_points: 
     16    # Put any entry points (scripts to be generated automatically) here. The 
     17    # syntax is module:function.  For example 
     18    # 
     19    # - periodictable = periodictable:main 
     20    # 
     21    # Would create an entry point called periodictable that calls periodictable.main() 
     22 
     23 
     24  # If this is a new build for the same version, increment the build 
     25  # number. If you do not include this key, it defaults to 0. 
     26  # number: 1 
     27 
     28requirements: 
     29  build: 
     30    - python 
     31    - setuptools 
     32    - pyparsing 
     33    - numpy 
     34 
     35  run: 
     36    - python 
     37    - pyparsing 
     38    - numpy 
     39 
    2140test: 
    22   commands: [] 
    23   files: [] 
    24   imports: [periodictable] 
    25   requires: [] 
     41  # Python imports 
     42  imports: 
     43    - periodictable 
     44 
     45  #commands: 
     46    # You can put test commands to be run here.  Use this to test that the 
     47    # entry points work. 
     48 
     49 
     50  # You can also put a file called run_test.py in the recipe that will be run 
     51  # at test time. 
     52 
     53  # requires: 
     54    # Put any additional test requirements here.  For example 
     55    # - nose 
     56 
     57about: 
     58  home: http://www.reflectometry.org/danse/elements.html 
     59  license: public domain 
     60  summary: 'Extensible periodic table of the elements' 
     61 
     62# See 
     63# http://docs.continuum.io/conda/build.html for 
     64# more information about meta.yaml 

  • build_tools/conda/unittest-xml-reporting/meta.yaml

    rf479ac3 r55bde35  
    1 about: {home: 'http://github.com/xmlrunner/unittest-xml-reporting/tree/master/', license: BSD 
    2     License, summary: unittest-based test runner with Ant/JUnit like XML reporting.} 
    3 build: 
    4   entry_points: [] 
    5   features: [] 
    6   string: '' 
    7   track_features: [] 
    8 package: {name: unittest-xml-reporting, version: 1.10.0} 
    9 requirements: 
    10   build: [python, setuptools, six >=1.4.0] 
    11   conflicts: [] 
    12   run: [python, six >=1.4.0] 
     1package: 
     2  name: unittest-xml-reporting 
     3  version: !!str 1.10.0 
     4 
    135source: 
    146  fn: unittest-xml-reporting-1.10.0.tar.gz 
    15   git_rev: '' 
     7  url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz 
    168  md5: f0d04be2b9bff5b744677b576c326620 
    17   patches: [] 
    18   path: '' 
    19   svn_rev: '' 
    20   url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz 
     9#  patches: 
     10   # List any patch files here 
     11   # - fix.patch 
     12 
     13# build: 
     14  #preserve_egg_dir: True 
     15  #entry_points: 
     16    # Put any entry points (scripts to be generated automatically) here. The 
     17    # syntax is module:function.  For example 
     18    # 
     19    # - unittest-xml-reporting = unittest-xml-reporting:main 
     20    # 
     21    # Would create an entry point called unittest-xml-reporting that calls unittest-xml-reporting.main() 
     22 
     23 
     24  # If this is a new build for the same version, increment the build 
     25  # number. If you do not include this key, it defaults to 0. 
     26  # number: 1 
     27 
     28requirements: 
     29  build: 
     30    - python 
     31    - setuptools 
     32    - six >=1.4.0 
     33 
     34  run: 
     35    - python 
     36    - six >=1.4.0 
     37 
    2138test: 
    22   commands: [] 
    23   files: [] 
    24   imports: [xmlrunner, xmlrunner.extra, xmlrunner.tests] 
    25   requires: [] 
     39  # Python imports 
     40  imports: 
     41    - xmlrunner 
     42    - xmlrunner.extra 
     43    - xmlrunner.tests 
     44 
     45  #commands: 
     46    # You can put test commands to be run here.  Use this to test that the 
     47    # entry points work. 
     48 
     49 
     50  # You can also put a file called run_test.py in the recipe that will be run 
     51  # at test time. 
     52 
     53  # requires: 
     54    # Put any additional test requirements here.  For example 
     55    # - nose 
     56 
     57about: 
     58  home: http://github.com/xmlrunner/unittest-xml-reporting/tree/master/ 
     59  license:  BSD License 
     60  summary: 'unittest-based test runner with Ant/JUnit like XML reporting.' 
     61 
     62# See 
     63# http://docs.continuum.io/conda/build.html for 
     64# more information about meta.yaml 

  • sasview/setup_exe.py

    r3a39c2e r4172557  
    307307# 
    308308packages = [ 
    309     'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 
     309    'matplotlib', 'scipy', 'encodings', 'comtypes', 
    310310    'win32com', 'ho.pisa', 'bumps', 
    311311    ] 
    … …  
    326326 
    327327# Exclude packages that are not needed but are often found on build systems 
    328 excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip'] 
     328excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz'] 
    329329 
    330330 

  • src/sas/perspectives/fitting/pagestate.py

    rb9a5f0e rd06ae30  
    472472        Get the values (strings) from __str__ for report 
    473473        """ 
    474         # Dictionary of teh report strings 
     474        # Dictionary of the report strings 
    475475        repo_time = "" 
    476476        model_name = "" 
    … …  
    508508            if name == "value": 
    509509                param_string += value + ',' 
     510            if name == "selected": 
     511                if value == u' False': 
     512                    fixed_parameter = True 
     513                else: 
     514                    fixed_parameter = False 
    510515            if name == "error value": 
    511                 param_string += value + ',' 
     516                if fixed_parameter: 
     517                    param_string += '(fixed),' 
     518                else: 
     519                    param_string += value + ',' 
    512520            if name == "parameter unit": 
    513521                param_string += value + ':' 

  • src/sas/perspectives/fitting/report_dialog.py

    r79492222 rd06ae30  
    11""" 
    22Dialog report panel to show and summarize the results of  
    3 the invariant calculation. 
     3the fitting calculation. 
    44""" 
    55################################################################################ 

  • src/sas/guiframe/gui_manager.py

    rb9a5f0e rad8872e  
    2424import logging 
    2525import httplib 
     26import webbrowser 
     27 
    2628 
    2729from sas.guiframe.events import EVT_CATEGORY 
    … …  
    13251327    def _add_help_menu(self): 
    13261328        """ 
    1327         add help menu 
     1329        add help menu to menu bar.  Includes welcome page, about page, 
     1330        tutorial PDF and documentation pages.  
    13281331        """ 
    13291332        # Help menu 
    … …  
    13361339                id = wx.NewId() 
    13371340                self._help_menu.Append(id, '&Welcome', '') 
    1338                 self._help_menu.AppendSeparator() 
    13391341                wx.EVT_MENU(self, id, self.show_welcome_panel) 
    13401342 
    1341         # Look for help item in plug-ins  
    1342         for item in self.plugins: 
    1343             if hasattr(item, "help"): 
    1344                 id = wx.NewId() 
    1345                 self._help_menu.Append(id,'&%s Help' % item.sub_menu, '') 
    1346                 wx.EVT_MENU(self, id, item.help) 
    1347  
    1348         # Only show new Sphinx docs link if version of wx supports displaying 
    1349         # it correctly. 
    1350         show_sphinx_docs = float(wx.__version__[:3]) >= 2.9 
    1351         if show_sphinx_docs: 
    1352             self._help_menu.AppendSeparator() 
    1353             id = wx.NewId() 
    1354             self._help_menu.Append(id, '&Sphinx Documentation', '') 
    1355             wx.EVT_MENU(self, id, self._onSphinxDocs) 
     1343        self._help_menu.AppendSeparator() 
     1344        id = wx.NewId() 
     1345        self._help_menu.Append(id, '& Documentation', '') 
     1346        wx.EVT_MENU(self, id, self._onSphinxDocs) 
    13561347 
    13571348        if config._do_tutorial and (IS_WIN or sys.platform =='darwin'): 
    … …  
    21622153    def _onSphinxDocs(self, evt): 
    21632154        """ 
    2164         Pop up a Sphinx Documentation dialog. 
     2155        Bring up Sphinx Documentation.  If Wx 2.9 or higher is installed  
     2156        with proper HTML support then Pop up a Sphinx Documentation dialog 
     2157        locally.  If not pop up a new tab in the default system browser  
     2158        calling the documentation website. 
    21652159         
    21662160        :param evt: menu event 
    … …  
    21682162        # Running SasView "in-place" using run.py means the docs will be in a 
    21692163        # different place than they would otherwise. 
    2170         SPHINX_DOC_ENV = "SASVIEW_DOC_PATH" 
    2171         if SPHINX_DOC_ENV in os.environ: 
    2172             docs_path = os.path.join(os.environ[SPHINX_DOC_ENV], "index.html") 
     2164 
     2165        show_sphinx_docs = float(wx.__version__[:3]) >= 2.9 
     2166        if show_sphinx_docs: 
     2167            SPHINX_DOC_ENV = "SASVIEW_DOC_PATH" 
     2168            if SPHINX_DOC_ENV in os.environ: 
     2169                docs_path = os.path.join(os.environ[SPHINX_DOC_ENV], "index.html") 
     2170            else: 
     2171                docs_path = os.path.join(PATH_APP, "..", "..", "doc", "index.html") 
     2172 
     2173            if os.path.exists(docs_path): 
     2174                from documentation_window import DocumentationWindow 
     2175 
     2176                sphinx_doc_viewer = DocumentationWindow(None, -1, docs_path) 
     2177                sphinx_doc_viewer.Show() 
     2178            else: 
     2179                logging.error("Could not find Sphinx documentation at '%' -- has it been built?" % docs_path) 
    21732180        else: 
    2174             docs_path = os.path.join(PATH_APP, "..", "..", "doc", "index.html") 
    2175  
    2176         if os.path.exists(docs_path): 
    2177             from documentation_window import DocumentationWindow 
    2178  
    2179             sphinx_doc_viewer = DocumentationWindow(None, -1, docs_path) 
    2180             sphinx_doc_viewer.Show() 
    2181         else: 
    2182             logging.error("Could not find Sphinx documentation at '%' -- has it been built?" % docs_path) 
     2181            #For red hat and maybe others who do not have Wx 3.0 
     2182            #just send to webpage of documentation 
     2183            webbrowser.open_new_tab('http://www.sasview.org/sasview') 
    21832184 
    21842185    def set_manager(self, manager): 
Note: See TracChangeset for help on using the changeset viewer.