Changes in / [3fb9404:0d5a655] in sasmodels

File:

• appveyor.yml (modified) (5 diffs)

appveyor.yml

@@ -4 +4 @@
   # /E:ON and /V:ON options are not enabled in the batch script interpreter
   # See: http://stackoverflow.com/a/13751649/163740
-  # 2018-01-19 PAK: probably irrelevant now that we are using tinycc rather than msvc
-  #CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
+  CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
 
   # Workaround for https://github.com/conda/conda-build/issues/636
@@ -23 +22 @@
     - TARGET_ARCH: "x86"
       CONDA_PY: "35"
-      PY_CONDITION: "python >=3.5,<3.6"
+      PY_CONDITION: "python >=3.5"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35"
     - TARGET_ARCH: "x64"
@@ -35 +34 @@
     - TARGET_ARCH: "x64"
       CONDA_PY: "35"
-      PY_CONDITION: "python >=3.5,<3.6"
+      PY_CONDITION: "python >=3.5"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
 
@@ -44 +43 @@
 
 install:
-    # Set the CONDA_NPY, although it has no impact on the actual build. 
-    # We need this because of a test within conda-build.
+    # Set the CONDA_NPY, although it has no impact on the actual build. We need this because of a test within conda-build.
     - cmd: set CONDA_NPY=19
 
     # Remove cygwin (and therefore the git that comes with it).
-    # 2018-01-19 PAK: irrelevant since we already pulled the repo
-    #- cmd: rmdir C:\cygwin /s /q
-
-    # Set the conda path; would be nice to do this
-    - cmd: path %CONDA_INSTALL_LOCN%\Scripts;%PATH%
+    - cmd: rmdir C:\cygwin /s /q
 
     # Use the pre-installed Miniconda for the desired arch
@@ -62 +56 @@
     # so that we can update it. Then we remove it so that
     # we can do a proper activation.
+    - cmd: set "OLDPATH=%PATH%"
+    - cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
     - cmd: conda update --yes --quiet conda python
+    - cmd: set "PATH=%OLDPATH%"
     - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-    #- cmd: conda config --add channels conda-forge
-    #- cmd: conda config --set show_channel_urls true
-    #- cmd: conda install --yes --quiet obvious-ci
-    # 2018-01-19 PAK: skipping toolchain cython and cffi (these were for pyopencl?)
-    - cmd: conda install --yes --quiet numpy scipy
-    # 2018-01-19 PAK: skipping pyopencl; this would be needed for deploy but maybe not for test
+
+    - cmd: conda config --add channels conda-forge
+    - cmd: conda config --set show_channel_urls true
+    - cmd: conda update --yes --quiet conda
+    - cmd: conda install --yes --quiet obvious-ci
+    - cmd: conda install --yes --quiet numpy toolchain scipy cython cffi
     #- cmd: conda install --yes --channel conda-forge pyopencl
-    # 2018-01-19 PAK: 3rd party packages might need msvc, so %CMD_IN_ENV% may be needed for pip
     - cmd: pip install bumps unittest-xml-reporting tinycc
 
 build_script:
     # Build the project
-    # 2018-01-19 PAK: maybe need one of this if using msvc?
-    #- "%CMD_IN_ENV% python setup.py build"
-    #- cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd python setup.py build
-    - python setup.py build
+    - "%CMD_IN_ENV% python setup.py build"
 
 test_script:
     # Run the project tests
-    # 2018-01-19 PAK: maybe need one of this if using msvc?
-    #- "%CMD_IN_ENV% python -m sasmodels.model_test dll all"
-    #- cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd python -m sasmoels.model_test dll all
-    - python -m sasmodels.model_test dll all
+    - "%CMD_IN_ENV% python -m sasmodels.model_test dll all"