From 2ec1163a14a16cf4ee3eaf5f7e0928ddcc200f74 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Fri, 26 Oct 2018 08:46:20 +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@173833 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                   |  1 +
 .../clients/configuration/Configuration.java           |  2 ++
 .../clients/configuration/ConfigurationImpl.java       |  8 ++++++++
 .../clients/configurations/AbstractConfiguration.java  | 10 ++++++++++
 .../dataminer/poolmanager/util/SVNUpdater.java         |  2 ++
 5 files changed, 23 insertions(+)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index e35425f..1489224 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,6 +1,7 @@
 <ReleaseNotes>
 <Changeset component="dataminer-pool-manager.2-5-0" date="${buildDate***REMOVED***">
   <Change>SVN parameters get from IS</Change>
+  <Change>Python3.6 added [ticket #12742]</Change>
 </Changeset>
 <Changeset component="dataminer-pool-manager.2-4-0" date="${buildDate***REMOVED***">
   <Change>Notifies the 'conflicts' on SVN</Change>
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java
index f2ed60e..19340ed 100755
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java
@@ -24,6 +24,8 @@ public interface Configuration {
 	public String getSVNOctaveDepsList();
 
 	public String getSVNPythonDepsList();
+	
+	public String getSVNPython3_6DepsList();
 
 	public String getSVNWCDepsList();
 	
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java
index e679a5d..106d23a 100755
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java
@@ -122,6 +122,14 @@ public class ConfigurationImpl implements Configuration {
 		return this.cache.getConfiguration(this.type).getDepsPython();
 ***REMOVED***
 
+
+	@Override
+	public String getSVNPython3_6DepsList() {
+
+		return this.cache.getConfiguration(this.type).getDepsPython3_6();
+***REMOVED***
+
+	
 	@Override
 	public String getSVNWCDepsList() {
 
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java
index 5c8af71..e3cabbc 100755
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java
@@ -18,6 +18,7 @@ public abstract class AbstractConfiguration
 	private String depsKnimeWorkflow;
 	private String depsOctave;
 	private String depsPython;
+	private String depsPython3_6;
 	private String depsWindowsCompiled;
 
 
@@ -123,6 +124,14 @@ public abstract class AbstractConfiguration
 		this.depsPython = depsPython;
 ***REMOVED***
 	
+	@XmlElement (name="deps-python3_6")
+	public String getDepsPython3_6() {
+		return depsPython3_6;
+***REMOVED***
+	public void setDepsPython3_6(String depsPython3_6) {
+		this.depsPython3_6 = depsPython3_6;
+***REMOVED***
+	
 	@XmlElement (name="deps-windows-compiled")
 	public String getDepsWindowsCompiled() {
 		return depsWindowsCompiled;
@@ -147,6 +156,7 @@ public abstract class AbstractConfiguration
 			    "<deps-knime-workflow>{$resource/Profile/Body/"+type+"/deps-knime-workflow/text()***REMOVED***</deps-knime-workflow >"+
 			    "<deps-octave>{$resource/Profile/Body/"+type+"/deps-octave/text()***REMOVED***</deps-octave>"+    
 			    "<deps-python>{$resource/Profile/Body/"+type+"/deps-python/text()***REMOVED***</deps-python>"+
+			    "<deps-python3_6>{$resource/Profile/Body/"+type+"/deps-python3_6/text()***REMOVED***</deps-python3_6>"+
 			    "<deps-windows-compiled>{$resource/Profile/Body/"+type+"/deps-windows-compiled/text()***REMOVED***</deps-windows-compiled></"+type+">";    
 ***REMOVED***
 	
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
index 4ee7b43..5e4a24f 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
@@ -90,6 +90,8 @@ public abstract class SVNUpdater {
 			return configuration.getSVNOctaveDepsList();
 		case "Python":
 			return configuration.getSVNPythonDepsList();
+		case "Python3.6":
+			return configuration.getSVNPythonDepsList();	
 		case "Pre-Installed":
 			return configuration.getSVNPreInstalledDepsList();
 		case "Windows-compiled":