Changeset 772e49c in sasmodels

Timestamp:

Jan 19, 2018 12:47:58 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1f4770c

Parents:

9c640ff

Message:

tweak appveyor config; maybe it will work?

File:

• appveyor.yml (modified) (3 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
+  # 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"
 
@@ -49 +49 @@
 
     # Remove cygwin (and therefore the git that comes with it).
-    # [2018-01-19 PAK] probably irrelevant since we already pulled the repo
+    # 2018-01-19 PAK: probably 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%
 
     # Use the pre-installed Miniconda for the desired arch
@@ -59 +62 @@
     # so that we can update it. Then we remove it so that
     # we can do a proper activation.
-    - cmd: set "CONDA_VER=%CONDA_INSTALL_LOCN%\\Scripts\conda"
-    - cmd: "%CONDA_VER%" update --yes --quiet conda python
+    - cmd: conda update --yes --quiet conda python
     - cmd: call "%CONDA_INSTALL_LOCN%\Scripts\activate.bat"
-    - cmd: "%CONDA_VER%" config --add channels conda-forge
-    - cmd: "%CONDA_VER%" config --set show_channel_urls true
-    - cmd: "%CONDA_VER%" install --yes --quiet obvious-ci
-    - cmd: "%CONDA_VER%" install --yes --quiet numpy toolchain scipy cython cffi
-    - cmd: "%CONDA_VER%" 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: conda config --add channels conda-forge
+    - cmd: conda config --set show_channel_urls true
+    - 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