From 5c9714ab71f4fab5910ec94af3bb790601ab206f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 31 Oct 2018 11:32:03 +0000 Subject: [PATCH] ref 12742: DataMiner - Support Python 3.6 https://support.d4science.org/issues/12742 Python3.6 added git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@173905 82a268e6-3cf1-43bd-a215-b396298e98cf --- src/main/resources/service.properties | 1 + src/test/java/DataminerPoolManagerTest.java | 2 -- .../dataminerpoolmanager/AlgorithmPackageParserTest.java | 2 -- .../dataminerpoolmanager/DataminerPoolManagerTest.java | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/resources/service.properties b/src/main/resources/service.properties index fac2c88..9ab3290 100644 --- a/src/main/resources/service.properties +++ b/src/main/resources/service.properties @@ -17,6 +17,7 @@ svn.stage.deps-java = svn.stage.deps-knime-workflow = svn.stage.deps-octave = svn.stage.deps-python = +svn.stage.deps-python3_6= svn.stage.deps-windows-compiled = #PROD diff --git a/src/test/java/DataminerPoolManagerTest.java b/src/test/java/DataminerPoolManagerTest.java index 4f1ef47..ad70c13 100644 --- a/src/test/java/DataminerPoolManagerTest.java +++ b/src/test/java/DataminerPoolManagerTest.java @@ -1,13 +1,11 @@ import java.net.ProxySelector; -import java.util.UUID; ***REMOVED*** ***REMOVED*** import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.AlgorithmSet; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Dependency; -***REMOVED*** import org.gcube.dataanalysis.dataminer.poolmanager.util.PropertiesBasedProxySelector; public class DataminerPoolManagerTest ***REMOVED*** diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AlgorithmPackageParserTest.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AlgorithmPackageParserTest.java index 1cf3739..e366bd6 100644 --- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AlgorithmPackageParserTest.java +++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/AlgorithmPackageParserTest.java @@ -2,7 +2,6 @@ package org.gcube.dataanalysis.dataminerpoolmanager; ***REMOVED*** import java.io.InputStream; -import java.net.ProxySelector; ***REMOVED*** ***REMOVED*** import java.util.Vector; @@ -11,7 +10,6 @@ import java.util.Vector; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.AlgorithmSet; import org.gcube.dataanalysis.dataminer.poolmanager.process.AddAlgorithmCommand; import org.gcube.dataanalysis.dataminer.poolmanager.process.AlgorithmPackageParser; -import org.gcube.dataanalysis.dataminer.poolmanager.util.PropertiesBasedProxySelector; public class AlgorithmPackageParserTest ***REMOVED*** diff --git a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/DataminerPoolManagerTest.java b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/DataminerPoolManagerTest.java index 710942a..bc2ec8d 100644 --- a/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/DataminerPoolManagerTest.java +++ b/src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/DataminerPoolManagerTest.java @@ -1,13 +1,11 @@ package org.gcube.dataanalysis.dataminerpoolmanager; import java.net.ProxySelector; -import java.util.UUID; ***REMOVED*** ***REMOVED*** import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.AlgorithmSet; import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Dependency; -***REMOVED*** import org.gcube.dataanalysis.dataminer.poolmanager.util.PropertiesBasedProxySelector; public class DataminerPoolManagerTest ***REMOVED***