Detect conda on Windows

Author: nygrenh

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.14-SNAPSHOT</version>
+    <version>0.7.15-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.14-SNAPSHOT</version>
+    <version>0.7.15-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-make/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-notests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-python3/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-python3/src/main/java/fi/helsinki/cs/tmc/langs/python3/Python3Plugin.java

@@ -138,8 +138,17 @@ private String[] getAvailablePointsCommand() {
     }
 
     private String[] getTestCommand() {
-        String[] command =
-                SystemUtils.IS_OS_WINDOWS ? new String[] {"py", "-3"} : new String[] {"python3"};
+        String[] command = null;
+        if (SystemUtils.IS_OS_WINDOWS) {
+            command = new String[] {"py", "-3"};
+            // Conda only works with the "python"-command on windows
+            String condaPython = System.getenv("CONDA_PYTHON_EXE");
+            if (condaPython != null && !condaPython.isEmpty() && Files.exists(Paths.get(condaPython))) {
+                command = new String[] {condaPython};
+            }
+        } else {
+            command = new String[] {"python3"};
+        }
         return ArrayUtils.addAll(command, "-m", "tmc");
     }
 

tmc-langs-qmake/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-r/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
     <artifactId>tmc-langs-r</artifactId>
     <packaging>jar</packaging>

tmc-langs-util/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.14-SNAPSHOT</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
     <artifactId>tmc-langs-util</artifactId>
     <packaging>jar</packaging>