Changes in / [16a8c63:3fd0499] in sasmodels

Files:

• .gitattributes (modified) (1 diff)
• .travis.yml (modified) (1 diff)
• sasmodels/models/cylinder.py (modified) (2 diffs)
• sasmodels/models/parallelepiped.py (modified) (3 diffs)
• sasmodels/models/triaxial_ellipsoid.py (modified) (1 diff)

.gitattributes

@@ -1 @@
-*.py text=auto eol=lf
-*.c text=auto eol=lf
-*.h text=auto eol=lf
-*.cpp text=auto eol=lf
-*.rst text=auto eol=lf
+*.py text eol=lf
+*.c text eol=lf
+*.h text eol=lf
+*.cpp text eol=lf
+*.rst text eol=lf

.travis.yml

@@ -1 +1 @@
 language: python
-python:
-- '2.7'
+
+sudo:  false
+
+matrix:
+  include:
+    - os: linux
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: linux
+      env:
+        - PY=3
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=3
+        - NUMPYSPEC=numpy
+
+# whitelist
 branches:
   only:
-  - master
-virtualenv:
-  system_site_packages: true
+    - master
+
+addons:
+  apt:
+    packages:
+      opencl-headers
+
 before_install:
-- sudo apt-get update;
-- sudo apt-get install python-numpy python-scipy
+  - 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;
+    fi;
+  - if [[ "$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
+
+  - conda install --yes python=$PY $NUMPYSPEC scipy cython mako cffi
+
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      pip install pyopencl;
+    fi;
+
 install:
-- pip install bumps
-- pip install unittest-xml-reporting
+  - pip install bumps
+  - pip install unittest-xml-reporting
+
 script:
 - export WORKSPACE=/home/travis/build/SasView/sasmodels/
 - python -m sasmodels.model_test dll all
+
 notifications:
   slack:

sasmodels/models/cylinder.py

@@ -38 +38 @@
 
 
-Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with 
-$sin(\alpha)=\sqrt{1-u^2}$. 
+Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with
+$sin(\alpha)=\sqrt{1-u^2}$.
 
 The output of the 1D scattering intensity function for randomly oriented
@@ -156 +156 @@
 tests = [[{}, 0.2, 0.042761386790780453],
         [{}, [0.2], [0.042761386790780453]],
-#  new coords    
+#  new coords
         [{'theta':80.1534480601659, 'phi':10.1510817110481}, (qx, qy), 0.03514647218513852],
         [{'theta':80.1534480601659, 'phi':10.1510817110481}, [(qx, qy)], [0.03514647218513852]],

sasmodels/models/parallelepiped.py

@@ -24 +24 @@
    The edge of the solid used to have to satisfy the condition that $A < B < C$.
    After some improvements to the effective radius calculation, used with an S(Q),
-   it is beleived that this is no longer the case. 
+   it is beleived that this is no longer the case.
 
 The 1D scattering intensity $I(q)$ is calculated as:
@@ -189 +189 @@
             mu = q*B
         V: Volume of the rectangular parallelepiped
-        alpha: angle between the long axis of the 
+        alpha: angle between the long axis of the
             parallelepiped and the q-vector for 1D
 """
@@ -219 +219 @@
     Return effective radius (ER) for P(q)*S(q)
     """
-    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller 
+    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller
     # or much larger
     abc = np.vstack((length_a, length_b, length_c))

sasmodels/models/triaxial_ellipsoid.py

@@ -113 +113 @@
 * **Author:** NIST IGOR/DANSE **Date:** pre 2010
 * **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017
-* **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017
+* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017
 
 """