Changes in / [00a6ec4:4fb10e5] in sasview

Files:

• .gitignore (modified) (1 diff)
• .travis.yml (modified) (1 diff)
• src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) (3 diffs)
• test/logging.ini (modified) (1 diff)
• test/run_one.py (modified) (1 diff)
• test/sasdataloader/test/testLoad.py (modified) (1 diff)
• test/utest_sasview.py (modified) (2 diffs)

.gitignore

@@ -58 +58 @@
 /test/sasdataloader/test/isis_1_1_write_test.xml
 /test/sasdataloader/test/write_test.xml
-test*log
 
 # autogenerated scripts

.travis.yml

@@ +1 @@
+# Test Travis CL
+
 language: python
+
 matrix:
   include:
-  - os: linux
-    env:
-    - PY=2.7
-    - NUMPYSPEC=numpy
-  - os: osx
-    language: generic
-    env:
-    - PY=2.7
-    - NUMPYSPEC=numpy
+    - os: linux
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+
+# whitelist
 branches:
   only:
-  - master
+    - master
+
 addons:
   apt:
     packages:
-    - opencl-headers
-    - fglrx
-    - libblas-dev
-    - libatlas-dev
-    - libatlas-base-dev
-    - liblapack-dev
-    - gfortran
-    - libhdf5-serial-dev
+      - opencl-headers
+      - fglrx
+      - libblas-dev
+      - libatlas-dev
+      - libatlas-base-dev
+      - liblapack-dev
+      - gfortran
+      - libhdf5-serial-dev
+
 before_install:
-- echo $TRAVIS_OS_NAME
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; sudo apt-get update; sudo apt-get install python-pyopencl; elif
-  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-  -O miniconda.sh; fi
-- bash miniconda.sh -b -p $HOME/miniconda
-- export PATH="$HOME/miniconda/bin:$PATH"
-- hash -r
-- conda update --yes conda
-- conda info -a
-- conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
+  - echo $TRAVIS_OS_NAME
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+        sudo apt-get update; sudo apt-get install python-pyopencl;
+    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
+    fi
+
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda update --yes conda
+
+  # Useful for debugging any issues with conda
+  - conda info -a
+
+  # could install other dependencies, but they're locked to specific
+  # versions in build/requirements.txt
+  - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
+
 install:
-- pip install -r build_tools/requirements.txt
-- pip install matplotlib
+  - pip install -r build_tools/requirements.txt
+  - pip install matplotlib
+
+#before_script:
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+#        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start
+#    fi
+
 script:
-- cd ..
-- export WORKSPACE=$(pwd)
-- git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
-- git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
-- ls -ltr
-- if [ ! -d "utils" ]; then mkdir utils; fi
-- /bin/sh -xe sasview/build_tools/travis_build.sh
-- export LC_ALL=en_US.UTF-8
-- export LANG=en_US.UTF-8
-notifications:
-  slack:
-    secure: TlsEpZiMLmOOgnmdG0I/oB4tq3bbQYeBBQi6S5qLlkYE9EjUTbbfg7oz0JYUsQ56FAsdFR8zswpBsX7PebZerzrq0ZmvfHSiJhOFIdBfY5Nb7bmLW8/9pUNWV57ON/8Gw2fE5ytc7FgvCGR64yb2QISI/150SIUwvdL5HXTxRWI=
+  - cd ..
+  # this should be the directory above the sasview directory, where we want to
+  # clone the sasmodels
+  - export WORKSPACE=$(pwd)
+  - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
+
+  # required for documentation
+  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
+
+  - ls -ltr
+  - if [ ! -d "utils" ]; then mkdir utils; fi
+  - /bin/sh -xe sasview/build_tools/travis_build.sh
+  - export LC_ALL=en_US.UTF-8
+  - export LANG=en_US.UTF-8
+#  - python setup.py docs; echo 0
+#  - python setup.py bdist_egg --skip-build
+

src/sas/sasgui/guiframe/media/data_formats_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 .. WG Bouwman, DUT, added during CodeCamp-V in Oct 2016 the SESANS data format
-.. WG Bouwman, DUT, updated during CodeCamp-VI in Apr 2017 the SESANS data format
 
 .. _Formats:
@@ -83 +82 @@
 The file format has a list of name-value pairs at the top of the file which detail the general experimental parameters necessary for fitting and analyzing data. This list should contain all the information necessary for the file to be 'portable' between users.
 
-Following the header is a 8 (only the first 4 are really needed) column list of instrument experimental variables:
+Following the header is a 6 column list of instrument experimental variables:
 
 - Spin echo length (z, in Angstroms)
-- depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom^-1 cm^-1)
-- depolarization error in the same unit) (measurement error)
 - Spin echo length error (:math:`\Delta`\ z, in Angstroms) (experimental resolution)
-- Neutron wavelength (:math:`\lambda`, in Angstroms)
+- Neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments)
 - Neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
 - Normalized polarization (:math:`P/P_0`, unitless)
@@ -96 +93 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Wim Bouwman, 05Apr2017
+.. note::  This help document was last changed by Steve King, 07Oct2016

test/logging.ini

@@ -29 +29 @@
 level=INFO
 formatter=detailed
-args=('tests.log','w')
+args=(os.path.join(os.path.expanduser("~"),'.sasview/tests.log'),"w")
 
 ###############################################################################

test/run_one.py

@@ -15 +15 @@
     logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False)
 
-if len(sys.argv) < 2:
-    logger.error("Use %s <filename to test>",sys.argv[0])
-    sys.exit(-1)
 
 run_py = joinpath(dirname(dirname(abspath(__file__))), 'run.py')

test/sasdataloader/test/testLoad.py

@@ -19 +19 @@
     HAS_IMAGE = True
 except:
-    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE")
+    print "IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE"
     
 import os.path

test/utest_sasview.py

@@ -8 +8 @@
 import logging.config
 LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini')
+print LOGGER_CONFIG_FILE
 logging.config.fileConfig(LOGGER_CONFIG_FILE)
 logger = logging.getLogger(__name__)
@@ -49 +50 @@
             continue
         
-
         # Go through modules looking for unit tests
         module_dir = os.path.join(test_root, d, "test")