Changes in / [587cbcd:bccb40f] in sasmodels

Files:

• .gitattributes (deleted)
• .travis.yml (modified) (1 diff)
• appveyor.yml (deleted)
• sasmodels/kerneldll.py (modified) (4 diffs)
• sasmodels/kernelpy.py (modified) (1 diff)

.travis.yml

@@ -1 +1 @@
 language: python
-
-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
+python:
+- '2.7'
 branches:
   only:
-    - master
-
-addons:
-  apt:
-    packages:
-      opencl-headers
-
+  - master
+virtualenv:
+  system_site_packages: true
 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;
-    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;
-
+- sudo apt-get update;
+- sudo apt-get install python-numpy python-scipy
 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/kerneldll.py

@@ -97 +97 @@
 
 if "SAS_COMPILER" in os.environ:
-    COMPILER = os.environ["SAS_COMPILER"]
+    compiler = os.environ["SAS_COMPILER"]
 elif os.name == 'nt':
-    if tinycc is not None:
-        COMPILER = "tinycc"
-    elif "VCINSTALLDIR" in os.environ:
-        # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
-        # and we can use the MSVC compiler.  Otherwise, if tinycc is available
-        # the use it.  Otherwise, hope that mingw is available.
-        COMPILER = "msvc"
+    # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
+    # and we can use the MSVC compiler.  Otherwise, if tinycc is available
+    # the use it.  Otherwise, hope that mingw is available.
+    if "VCINSTALLDIR" in os.environ:
+        compiler = "msvc"
+    elif tinycc:
+        compiler = "tinycc"
     else:
-        COMPILER = "mingw"
+        compiler = "mingw"
 else:
-    COMPILER = "unix"
+    compiler = "unix"
 
 ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86
-if COMPILER == "unix":
+if compiler == "unix":
     # Generic unix compile
     # On mac users will need the X code command line tools installed
@@ -123 +123 @@
         """unix compiler command"""
         return CC + [source, "-o", output, "-lm"]
-elif COMPILER == "msvc":
+elif compiler == "msvc":
     # Call vcvarsall.bat before compiling to set path, headers, libs, etc.
     # MSVC compiler is available, so use it.  OpenMP requires a copy of
@@ -139 +139 @@
         """MSVC compiler command"""
         return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output]
-elif COMPILER == "tinycc":
+elif compiler == "tinycc":
     # TinyCC compiler.
     CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split()
@@ -145 +145 @@
         """tinycc compiler command"""
         return CC + [source, "-o", output]
-elif COMPILER == "mingw":
+elif compiler == "mingw":
     # MinGW compiler.
     CC = "gcc -shared -std=c99 -O2 -Wall".split()

sasmodels/kernelpy.py

@@ -235 +235 @@
             # exclude all q for that NaN.  Even better would be to have an
             # INVALID expression like the C models, but that is too expensive.
-            Iq = np.asarray(form(), 'd')
+            Iq = form()
             if np.isnan(Iq).any(): continue