Changeset 390494d in sasview

Timestamp:

Feb 22, 2019 9:52:14 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, 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:

• setup.py (modified) (3 diffs)
• build_tools/conda_qt5_osx.yml (modified) (1 diff)
• build_tools/conda_qt5_win_commercial.yml (modified) (1 diff)
• build_tools/jenkins_qt5_win.bat (modified) (1 diff)
• build_tools/jenkins_qt5_win_commercial.bat (modified) (1 diff)
• build_tools/jenkins_ubuntu_build.sh (modified) (1 diff)
• docs/sphinx-docs/source/index.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/RELEASE.rst (added)
• docs/sphinx-docs/source/user/marketplace.rst (modified) (2 diffs)
• docs/sphinx-docs/source/user/tutorial.rst (modified) (1 diff)
• installers/installer_generator64.py (added)
• installers/license.txt (modified) (1 diff)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (1 diff)

setup.py

@@ -197 +197 @@
         build_sphinx.rebuild()
 
+_ = subprocess.call([sys.executable, "src/sas/qtgui/convertUI.py"])
 
 # sas module
@@ -454 +455 @@
                                ]
 packages.append("sas.sasview")
+package_data['sas.qtgui'] = ['Calculators/UI/*',
+                             'MainWindow/UI/*',
+                             'Perspectives/Corfunc/UI/*',
+                             'Perspectives/Fitting/UI/*',
+                             'Perspectives/Invariant/UI/*',
+                             'Perspectives/Inversion/UI/*',
+                             'Plotting/UI/*',
+                             'Utilities/UI/*',
+                             'UI/*',
+                             'UI/res/*',
+                             ]
+packages.append("sas.qtgui")
 
 required = [
@@ -490 +503 @@
     entry_points={
         'console_scripts': [
-            "sasview = sas.run",
+            "sasview=sas.qtgui.MainWindow.MainWindow:run_sasview",
         ]
     },

build_tools/conda_qt5_osx.yml

@@ -57 +57 @@
  - kiwisolver=1.0.1=py36h2d50403_2
  - libffi=3.2.1=hfc679d8_5
- - libgfortran=3.0.0=1001
+ - libgfortran=3.0.1
  - libiconv=1.15=h1de35cc_1004
  - libpng=1.6.36=ha441bb4_1000

build_tools/conda_qt5_win_commercial.yml

@@ -22 +22 @@
    - periodictable==1.5.0
    - xhtml2pdf==0.2.3
-   - ../../../PyQt5_commercial-5.11.3-5.11.2-cp35.cp36.cp37.cp38-none-win_amd64.whl
+   - ../../../PyQt5_commercial-5.12-5.12.1-cp35.cp36.cp37.cp38-none-win_amd64.whl
    - qt5reactor==0.5
    - qtconsole

build_tools/jenkins_qt5_win.bat

@@ -81 +81 @@
 
 :: READY FOR INNO
-%PYTHON% installer_generator.py
+%PYTHON% installer_generator64.py
 %INNO% installer.iss
 cd Output

build_tools/jenkins_qt5_win_commercial.bat

@@ -81 +81 @@
 
 :: READY FOR INNO
-%PYTHON% installer_generator.py
+%PYTHON% installer_generator64.py
 %INNO% installer.iss
 cd Output

build_tools/jenkins_ubuntu_build.sh

@@ -64 +64 @@
 tar czvf SasView.tar.gz SasView
 
+#Ymls storage
+cd $WORKSPACE
+conda env export >  env-build.yml
+conda list --explicit > explicit.yml
+
+a='/home/sasview/logs/'
+b='_env_build.yml'
+DEST_FILE=$a$BUILD_NUMBER$b
+cp env-build.yml $DEST_FILE

docs/sphinx-docs/source/index.rst

@@ -10 +10 @@
    :maxdepth: 1
 
-   User Documentation <user/user>
+   USER DOCUMENTATION <user/user>
 
-   Developer Documentation <dev/dev>
+   DEVELOPER DOCUMENTATION <dev/dev>
+   
+   Release Notes <user/RELEASE>
+   

docs/sphinx-docs/source/user/marketplace.rst

@@ -6 +6 @@
 plug-in fitting models for *SasView* for all to use.
 
-.. note:: These plug-in models require SasView version 4.0 or later.
+.. note:: 
+    These plug-in models require SasView version 4.0 or later. However, 
+    not *all* models may work with *every* version of SasView because 
+    of changes to our API.
 
 Contributed models should be written in Python (only version 2.7.x is
@@ -12 +15 @@
 combination of Python and C. You only need to upload the .py/.c source
 code files to the Marketplace!
+
+Please put a comment in your code to indicate which version of SasView you 
+wrote the model for.
 
 For guidance on how to write a plugin model see :ref:`Writing_a_Plugin` . It

docs/sphinx-docs/source/user/tutorial.rst

@@ -8 +8 @@
 .. note:: In Windows use [Alt]-[Cursor left] to return to the previous page
 
+The following tutorial was written for Version 2.x but is still a useful overview of 
+much of the analysis capability in SasView (but disregard Appendix XIII if using 
+Version 4.2 or later)
+
+:download:`Old Tutorial <sasview/Tutorial.pdf>`
+
+The following tutorials have been written for Version 4.x
+
 :download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>`
 
-:download:`Old Tutorial <sasview/Tutorial.pdf>`
+:download:`Basic 1D Fitting in Sasview <sasview/basic_1d_fitting_in_sasview_v3x_4x.pdf>`
+
+:download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>`
+
+:download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>`

installers/license.txt

@@ -19 +19 @@
 developed under NSF award DMR-0520547."*
 
-(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT
+(C) 2009-2019 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT

src/sas/qtgui/MainWindow/GuiManager.py

@@ -1019 +1019 @@
     def actionTutorial(self):
         """
-        Open the tutorial PDF file with default PDF renderer
-        """
-        # Not terribly safe here. Shell injection warning.
-        # isfile() helps but this probably needs a better solution.
-        if os.path.isfile(self._tutorialLocation):
-            result = subprocess.Popen([self._tutorialLocation], shell=True)
+        Open the page with tutorial PDF links
+        """
+        helpfile = "/user/tutorial.html"
+        self.showHelp(helpfile)
 
     def actionAcknowledge(self):