From e4a4b07f129a0e2318cdd37b3b2894dd5192da9e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi 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 194aac8..8d91d3c 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,6 +1,7 @@ SVN parameters get from IS + Python3.6 added [ticket #12742] Notifies the 'conflicts' on SVN 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 f2044c0..1de7f6d 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 ***REMOVED*** 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 f7cdb99..922e7f9 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 ***REMOVED*** return this.cache.getConfiguration(this.type).getDepsPython(); ***REMOVED*** + +***REMOVED*** + public String getSVNPython3_6DepsList() ***REMOVED*** + + return this.cache.getConfiguration(this.type).getDepsPython3_6(); +***REMOVED*** + + ***REMOVED*** public String getSVNWCDepsList() ***REMOVED*** 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 decf22d..ddd458a 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() ***REMOVED*** + return depsPython3_6; +***REMOVED*** + public void setDepsPython3_6(String depsPython3_6) ***REMOVED*** + this.depsPython3_6 = depsPython3_6; +***REMOVED*** + @XmlElement (name="deps-windows-compiled") public String getDepsWindowsCompiled() ***REMOVED*** return depsWindowsCompiled; @@ -147,6 +156,7 @@ public abstract class AbstractConfiguration "***REMOVED***$resource/Profile/Body/"+type+"/deps-knime-workflow/text()***REMOVED***"+ "***REMOVED***$resource/Profile/Body/"+type+"/deps-octave/text()***REMOVED***"+ "***REMOVED***$resource/Profile/Body/"+type+"/deps-python/text()***REMOVED***"+ + "***REMOVED***$resource/Profile/Body/"+type+"/deps-python3_6/text()***REMOVED***"+ "***REMOVED***$resource/Profile/Body/"+type+"/deps-windows-compiled/text()***REMOVED***"; ***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 2fde62c..b070caf 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 ***REMOVED*** return configuration.getSVNOctaveDepsList(); case "Python": return configuration.getSVNPythonDepsList(); + case "Python3.6": + return configuration.getSVNPythonDepsList(); case "Pre-Installed": return configuration.getSVNPreInstalledDepsList(); case "Windows-compiled":