Changeset 390494d in sasview


Ignore:
Timestamp:
Feb 22, 2019 9:52:14 AM (4 weeks ago)
Author:
GitHub <noreply@…>
Branches:
ESS_GUI, ESS_GUI_sync_sascalc
Children:
1078936c, 44a698c
Parents:
091eee64 (diff), afdb3b3 (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.
git-author:
Piotr Rozyczko <piotr.rozyczko@…> (02/22/19 09:52:14)
git-committer:
GitHub <noreply@…> (02/22/19 09:52:14)
Message:

Merge pull request #206 from mrakitin/fix_installer

FIX: add a proper entry point

Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    re20870bc rafdb3b3  
    197197        build_sphinx.rebuild() 
    198198 
     199_ = subprocess.call([sys.executable, "src/sas/qtgui/convertUI.py"]) 
    199200 
    200201# sas module 
     
    454455                               ] 
    455456packages.append("sas.sasview") 
     457package_data['sas.qtgui'] = ['Calculators/UI/*', 
     458                             'MainWindow/UI/*', 
     459                             'Perspectives/Corfunc/UI/*', 
     460                             'Perspectives/Fitting/UI/*', 
     461                             'Perspectives/Invariant/UI/*', 
     462                             'Perspectives/Inversion/UI/*', 
     463                             'Plotting/UI/*', 
     464                             'Utilities/UI/*', 
     465                             'UI/*', 
     466                             'UI/res/*', 
     467                             ] 
     468packages.append("sas.qtgui") 
    456469 
    457470required = [ 
     
    490503    entry_points={ 
    491504        'console_scripts': [ 
    492             "sasview = sas.run", 
     505            "sasview=sas.qtgui.MainWindow.MainWindow:run_sasview", 
    493506        ] 
    494507    }, 
  • build_tools/conda_qt5_osx.yml

    ra1b49a7 r79d3025  
    5757 - kiwisolver=1.0.1=py36h2d50403_2 
    5858 - libffi=3.2.1=hfc679d8_5 
    59  - libgfortran=3.0.0=1001 
     59 - libgfortran=3.0.1 
    6060 - libiconv=1.15=h1de35cc_1004 
    6161 - libpng=1.6.36=ha441bb4_1000 
  • build_tools/conda_qt5_win_commercial.yml

    r13c552b r34c1352  
    2222   - periodictable==1.5.0 
    2323   - xhtml2pdf==0.2.3 
    24    - ../../../PyQt5_commercial-5.11.3-5.11.2-cp35.cp36.cp37.cp38-none-win_amd64.whl 
     24   - ../../../PyQt5_commercial-5.12-5.12.1-cp35.cp36.cp37.cp38-none-win_amd64.whl 
    2525   - qt5reactor==0.5 
    2626   - qtconsole 
  • build_tools/jenkins_qt5_win.bat

    rda046c99 rd1b525b  
    8181 
    8282:: READY FOR INNO 
    83 %PYTHON% installer_generator.py 
     83%PYTHON% installer_generator64.py 
    8484%INNO% installer.iss 
    8585cd Output 
  • build_tools/jenkins_qt5_win_commercial.bat

    r17f7df4 r4e61e9a  
    8181 
    8282:: READY FOR INNO 
    83 %PYTHON% installer_generator.py 
     83%PYTHON% installer_generator64.py 
    8484%INNO% installer.iss 
    8585cd Output 
  • build_tools/jenkins_ubuntu_build.sh

    r8e76e49 rec867f04  
    6464tar czvf SasView.tar.gz SasView 
    6565 
     66#Ymls storage 
     67cd $WORKSPACE 
     68conda env export >  env-build.yml 
     69conda list --explicit > explicit.yml 
     70 
     71a='/home/sasview/logs/' 
     72b='_env_build.yml' 
     73DEST_FILE=$a$BUILD_NUMBER$b 
     74cp env-build.yml $DEST_FILE 
  • docs/sphinx-docs/source/index.rst

    r5a73356a r091eee64  
    1010   :maxdepth: 1 
    1111 
    12    User Documentation <user/user> 
     12   USER DOCUMENTATION <user/user> 
    1313 
    14    Developer Documentation <dev/dev> 
     14   DEVELOPER DOCUMENTATION <dev/dev> 
     15    
     16   Release Notes <user/RELEASE> 
     17    
  • docs/sphinx-docs/source/user/marketplace.rst

    r59dfb53 r091eee64  
    66plug-in fitting models for *SasView* for all to use. 
    77 
    8 .. note:: These plug-in models require SasView version 4.0 or later. 
     8.. note::  
     9    These plug-in models require SasView version 4.0 or later. However,  
     10    not *all* models may work with *every* version of SasView because  
     11    of changes to our API. 
    912 
    1013Contributed models should be written in Python (only version 2.7.x is 
     
    1215combination of Python and C. You only need to upload the .py/.c source 
    1316code files to the Marketplace! 
     17 
     18Please put a comment in your code to indicate which version of SasView you  
     19wrote the model for. 
    1420 
    1521For guidance on how to write a plugin model see :ref:`Writing_a_Plugin` . It 
  • docs/sphinx-docs/source/user/tutorial.rst

    r3bd677b r091eee64  
    88.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    99 
     10The following tutorial was written for Version 2.x but is still a useful overview of  
     11much of the analysis capability in SasView (but disregard Appendix XIII if using  
     12Version 4.2 or later) 
     13 
     14:download:`Old Tutorial <sasview/Tutorial.pdf>` 
     15 
     16The following tutorials have been written for Version 4.x 
     17 
    1018:download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>` 
    1119 
    12 :download:`Old Tutorial <sasview/Tutorial.pdf>` 
     20:download:`Basic 1D Fitting in Sasview <sasview/basic_1d_fitting_in_sasview_v3x_4x.pdf>` 
     21 
     22:download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>` 
     23 
     24:download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>` 
  • installers/license.txt

    r2f6d340 r091eee64  
    1919developed under NSF award DMR-0520547."* 
    2020 
    21 (C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT 
     21(C) 2009-2019 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT 
  • src/sas/qtgui/MainWindow/GuiManager.py

    r33c0561 r091eee64  
    10191019    def actionTutorial(self): 
    10201020        """ 
    1021         Open the tutorial PDF file with default PDF renderer 
    1022         """ 
    1023         # Not terribly safe here. Shell injection warning. 
    1024         # isfile() helps but this probably needs a better solution. 
    1025         if os.path.isfile(self._tutorialLocation): 
    1026             result = subprocess.Popen([self._tutorialLocation], shell=True) 
     1021        Open the page with tutorial PDF links 
     1022        """ 
     1023        helpfile = "/user/tutorial.html" 
     1024        self.showHelp(helpfile) 
    10271025 
    10281026    def actionAcknowledge(self): 
Note: See TracChangeset for help on using the changeset viewer.