Changeset 13374be in sasview for sasview

Timestamp:

Sep 20, 2017 5:55:53 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50

Parents:

6d62b7f (diff), 2a399ca (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' into 4_1_issues

Location:

sasview

Files:

• test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
• test/2d_data/YBCO_12685__ISIS2D.txt (added)
• README.txt (modified) (1 diff)
• __init__.py (modified) (1 diff)
• local_config.py (modified) (1 diff)
• sasview.spec (modified) (1 diff)
• setup_exe.py (modified) (2 diffs)

sasview/README.txt

@@ -4 +4 @@
 1- Features
 ===========
+    - New in Version 4.1.2
+      --------------------
+      This point release is a bug-fix release addressing:
+
+       - Fixes #984: PDF Reports Generate Empty PDFs
+       - Fixes a path typo
+       - 64 bit and 32 bit Windows executables now available
+
+      It is recommended that all users upgrade to this version
+
+    - New in Version 4.1.1
+      --------------------
+      This point release is a bug-fix release addressing:
+
+       - Fixes #948: Mathjax CDN is going away
+       - Fixes #938: Cannot read canSAS1D file output by SasView
+       - Fixes #960: Save project throws error if empty fit page
+       - Fixes #929: Problem deleting data in first fit page
+       - Fixes #918: Test folders not bundled with release
+       - Fixes an issue with the live discovery of plugin models
+       - Fixes an issue with the NXcanSAS data loader
+       - Updated tutorials for SasView 4.x.y
+
     - New in Version 4.1.0
       ------------------

sasview/__init__.py

@@ -1 @@
-__version__ = "4.1"
+__version__ = "4.1.2"
 __build__ = "GIT_COMMIT"
 

sasview/local_config.py

@@ -47 +47 @@
 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.'''
 _acknowledgement_citation = \
-'''M. Doucet et al. SasView Version 4.1, Zenodo, 10.5281/zenodo.438138'''
+'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
 
 _acknowledgement =  \

sasview/sasview.spec

@@ -138 +138 @@
  'sasmodels.core',
  'pyopencl',
- 'tinycc'
+ 'tinycc',
+ 'xhtml2pdf'
 ]
 

sasview/setup_exe.py

@@ -179 +179 @@
 test_1d_dir = os.path.join(path, "test\\1d_data")
 test_2d_dir = os.path.join(path, "test\\2d_data")
+test_sesans_dir = os.path.join(path, "test\\sesans_data")
+test_convertible_dir = os.path.join(path, "test\\convertible_files")
 test_save_dir = os.path.join(path, "test\\save_states")
-test_upcoming_dir = os.path.join(path, "test\\upcoming_formats")
+test_coord_dir = os.path.join(path, "test\\coordinate_data")
+test_image_dir = os.path.join(path, "test\\image_data")
+test_other_dir = os.path.join(path, "test\\other_files")
 
 matplotlibdatadir = matplotlib.get_data_path()
@@ -269 +273 @@
 # Copying the images directory to the distribution directory.
 for f in findall(images_dir):
-    if not ".svn" in f:
-        data_files.append(("images", [f]))
+    data_files.append(("images", [f]))
 
 # Copying the HTML help docs
 for f in findall(media_dir):
-    if not ".svn" in f:
-        data_files.append(("media", [f]))
+    data_files.append(("media", [f]))
 
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\1d_data", [f]))
-
-# Copying the sample data user data
+    data_files.append(("test\\1d_data", [f]))
 for f in findall(test_2d_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\2d_data", [f]))
-
-# Copying the sample data user data
+    data_files.append(("test\\2d_data", [f]))
 for f in findall(test_save_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\save_states", [f]))
-
-# Copying the sample data user data
-for f in findall(test_upcoming_dir):
-    if not ".svn" in f:
-        data_files.append(("test\\upcoming_formats", [f]))
+    data_files.append(("test\\save_states", [f]))
+for f in findall(test_sesans_dir):
+    data_files.append(("test\\sesans_data", [f]))
+for f in findall(test_convertible_dir):
+    data_files.append(("test\\convertible_files", [f]))
+for f in findall(test_coord_dir):
+    data_files.append(("test\\coordinate_data", [f]))
+for f in findall(test_image_dir):
+    data_files.append(("test\\image_data", [f]))
+for f in findall(test_other_dir):
+    data_files.append(("test\\other_files", [f]))
 
 # Copying opencl include files