Changes in / [61f32d2b:ad8872e] in sasview


Ignore:
Files:
22 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • build_tools/conda/bumps/meta.yaml

    rb75079b rf479ac3  
    1 package: 
    2   name: bumps 
    3   version: !!str 0.7.5.4 
    4  
     1about: {home: 'http://www.reflectometry.org/danse/software.html', license: UNKNOWN, 
     2  summary: Data fitting with bayesian uncertainty analysis} 
     3build: 
     4  entry_points: [] 
     5  features: [] 
     6  string: '' 
     7  track_features: [] 
     8package: {name: bumps, version: 0.7.5.3} 
     9requirements: 
     10  build: [python, setuptools, six] 
     11  conflicts: [] 
     12  run: [python, six] 
    513source: 
    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  
    28 requirements: 
    29   build: 
    30     - python 
    31     - setuptools 
    32     - six 
    33  
    34   run: 
    35     - python 
    36     - six 
    37  
     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 
    3821test: 
    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  
    62 about: 
    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 
     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: [] 

  • build_tools/conda/periodictable/meta.yaml

    r55bde35 rf479ac3  
    1 package: 
    2   name: periodictable 
    3   version: !!str 1.4.1 
    4  
     1about: {home: 'http://www.reflectometry.org/danse/elements.html', license: public 
     2    domain, summary: Extensible periodic table of the elements} 
     3build: 
     4  entry_points: [] 
     5  features: [] 
     6  string: '' 
     7  track_features: [] 
     8package: {name: periodictable, version: 1.4.1} 
     9requirements: 
     10  build: [python, setuptools, pyparsing, numpy] 
     11  conflicts: [] 
     12  run: [python, pyparsing, numpy] 
    513source: 
    614  fn: periodictable-1.4.1.tar.gz 
     15  git_rev: '' 
     16  md5: 7246b63cc0b6b1be6e86b6616f9e866e 
     17  patches: [] 
     18  path: '' 
     19  svn_rev: '' 
    720  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  
    28 requirements: 
    29   build: 
    30     - python 
    31     - setuptools 
    32     - pyparsing 
    33     - numpy 
    34  
    35   run: 
    36     - python 
    37     - pyparsing 
    38     - numpy 
    39  
    4021test: 
    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  
    57 about: 
    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 
     22  commands: [] 
     23  files: [] 
     24  imports: [periodictable] 
     25  requires: [] 

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

    r55bde35 rf479ac3  
    1 package: 
    2   name: unittest-xml-reporting 
    3   version: !!str 1.10.0 
    4  
     1about: {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.} 
     3build: 
     4  entry_points: [] 
     5  features: [] 
     6  string: '' 
     7  track_features: [] 
     8package: {name: unittest-xml-reporting, version: 1.10.0} 
     9requirements: 
     10  build: [python, setuptools, six >=1.4.0] 
     11  conflicts: [] 
     12  run: [python, six >=1.4.0] 
    513source: 
    614  fn: unittest-xml-reporting-1.10.0.tar.gz 
     15  git_rev: '' 
     16  md5: f0d04be2b9bff5b744677b576c326620 
     17  patches: [] 
     18  path: '' 
     19  svn_rev: '' 
    720  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  
    28 requirements: 
    29   build: 
    30     - python 
    31     - setuptools 
    32     - six >=1.4.0 
    33  
    34   run: 
    35     - python 
    36     - six >=1.4.0 
    37  
    3821test: 
    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  
    57 about: 
    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 
     22  commands: [] 
     23  files: [] 
     24  imports: [xmlrunner, xmlrunner.extra, xmlrunner.tests] 
     25  requires: [] 

  • sasview/setup_exe.py

    r4172557 r3a39c2e  
    307307# 
    308308packages = [ 
    309     'matplotlib', 'scipy', 'encodings', 'comtypes', 
     309    'matplotlib', 'scipy', 'pytz', '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', 'pytz'] 
     328excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip'] 
    329329 
    330330 

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

    rd06ae30 rb9a5f0e  
    472472        Get the values (strings) from __str__ for report 
    473473        """ 
    474         # Dictionary of the report strings 
     474        # Dictionary of teh 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 
    515510            if name == "error value": 
    516                 if fixed_parameter: 
    517                     param_string += '(fixed),' 
    518                 else: 
    519                     param_string += value + ',' 
     511                param_string += value + ',' 
    520512            if name == "parameter unit": 
    521513                param_string += value + ':' 

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

    rd06ae30 r79492222  
    11""" 
    22Dialog report panel to show and summarize the results of  
    3 the fitting calculation. 
     3the invariant calculation. 
    44""" 
    55################################################################################ 
Note: See TracChangeset for help on using the changeset viewer.