Changeset a2b6e482 in sasview


Ignore:
Timestamp:
Feb 14, 2015 8:56:42 AM (8 years ago)
Author:
T Nielsen <torben.nielsen@…>
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:
4172557 (diff), 981a1d4 (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

Files:
22 added
6 edited

Legend:

Unmodified
Added
Removed
  • build_tools/conda/bumps/meta.yaml

    r6a72e1b rb75079b  
    1 about: {home: 'http://www.reflectometry.org/danse/software.html', license: UNKNOWN, 
    2   summary: Data fitting with bayesian uncertainty analysis} 
    3 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 
    428requirements: 
    529  build: 
     
    731    - setuptools 
    832    - six 
     33 
    934  run: 
    1035    - python 
    1136    - six 
    12 source: 
    13   fn: bumps-0.7.5.3.tar.gz 
    14   md5: f17b41412c3c8ad6432a42e42cb926d5 
    15   url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.3.tar.gz 
     37 
    1638test: 
     39  # Python imports 
    1740  imports: 
    1841    - bumps 
     
    2346    - bumps.mystic.examples 
    2447    - 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 
    2557  requires: 
    26     - numpy 
    27     - scipy 
    28     - matplotlib 
     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

    r6a72e1b r55bde35  
    1 about: {home: 'http://www.reflectometry.org/danse/elements.html', license: public 
    2     domain, summary: Extensible periodic table of the elements} 
    3 package: {name: periodictable, version: 1.4.1} 
     1package: 
     2  name: periodictable 
     3  version: !!str 1.4.1 
     4 
     5source: 
     6  fn: periodictable-1.4.1.tar.gz 
     7  url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz 
     8  md5: 7246b63cc0b6b1be6e86b6616f9e866e 
     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 
    428requirements: 
    529  build: 
     
    832    - pyparsing 
    933    - numpy 
     34 
    1035  run: 
    1136    - python 
    1237    - pyparsing 
    1338    - numpy 
    14 source: 
    15   fn: periodictable-1.4.1.tar.gz 
    16   md5: 7246b63cc0b6b1be6e86b6616f9e866e 
    17   url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz 
     39 
    1840test: 
     41  # Python imports 
    1942  imports: 
    2043    - 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

    r9701348 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   features: 
    5     - I dunno.  The ability to actually work would be nice feature of this recipe. 
    6 package: {name: unittest-xml-reporting, version: 1.10.0} 
     1package: 
     2  name: unittest-xml-reporting 
     3  version: !!str 1.10.0 
     4 
     5source: 
     6  fn: unittest-xml-reporting-1.10.0.tar.gz 
     7  url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz 
     8  md5: f0d04be2b9bff5b744677b576c326620 
     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 
    728requirements: 
    829  build: 
    930    - python 
    1031    - setuptools 
    11     - six 
     32    - six >=1.4.0 
     33 
    1234  run: 
    1335    - python 
    14     - six 
    15 source: 
    16   fn: unittest-xml-reporting-1.10.0.tar.gz 
    17   md5: f0d04be2b9bff5b744677b576c326620 
    18   url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz 
     36    - six >=1.4.0 
     37 
    1938test: 
     39  # Python imports 
    2040  imports: 
    2141    - xmlrunner 
    2242    - xmlrunner.extra 
    2343    - 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 
  • 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################################################################################ 
  • 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 
Note: See TracChangeset for help on using the changeset viewer.