From 315688cd7477e7b08ba87c6ac1379faef9cc759f Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Thu, 11 Apr 2019 16:22:17 +0200
Subject: [PATCH] windows tests: revamp conda env

---
 artiq/windows/default.nix | 5 +++--
 artiq/windows/install.nix | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix
index e7370c4..5eb72e3 100644
--- a/artiq/windows/default.nix
+++ b/artiq/windows/default.nix
@@ -36,10 +36,11 @@ let
       ${openssh}/bin/scp -P 2022 ${sshOpts} \
       "${src}" "${sshUser}@localhost:${target}"
   '';
+  condaEnv = "artiq-env";
   installCondaPkg = pkg: ''
     F="$(basename ${pkg})"
     ${scp pkg "$F"}
-    ${ssh "miniconda\\Scripts\\conda install $F"}
+    ${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} $F"}
     ${ssh "del $F"}
   '';
   makeTest = name: artiqPkg:
@@ -72,7 +73,7 @@ let
         # Allow tests to run for 2 minutes
         ${ssh "shutdown -s -t ${toString testTimeout}"}
 
-        ${ssh "miniconda\\scripts\\activate && miniconda\\python -m unittest discover -v artiq.test"}
+        ${ssh "miniconda\\scripts\\activate ${condaEnv} && miniconda\\envs\\${condaEnv}\\python -m unittest discover -v artiq.test"}
 
         # Abort timeouted shutdown
         ${ssh "shutdown -a"}
diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix
index 9c0459c..270d8f7 100644
--- a/artiq/windows/install.nix
+++ b/artiq/windows/install.nix
@@ -98,9 +98,11 @@ stdenv.mkDerivation {
     ${scp miniconda "Miniconda.exe"}
     ${ssh "start /wait \"\" Miniconda.exe /S /D=%cd%\\miniconda"}
     ${ssh "del Miniconda.exe"}
-    ${ssh "miniconda\\Scripts\\conda update -y python"}
-    ${ssh "miniconda\\Scripts\\conda install -y numpy h5py"}
-    ${ssh "miniconda\\Scripts\\conda install -y -c m-labs pythonparser"}
+
+    ${ssh "miniconda\\Scripts\\conda config --add channels conda-forge"}
+    ${ssh "miniconda\\Scripts\\conda config --add channels m-labs"}
+    ${ssh "miniconda\\Scripts\\conda create -y -n artiq-env"}
+    ${ssh "miniconda\\Scripts\\conda install -y -n artiq-env numpy scipy python-dateutil h5py pythonparser levenshtein outputcheck"}
     ${ssh "shutdown /p /f"}
 
     echo "Waiting for qemu exit"