gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2018-10-26 08:46:20 +00:00
parent 5e15b1fdaa
commit e4a4b07f12
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distro/changelog.xml
View File

@ -1,6 +1,7 @@
<ReleaseNotes>
<Changeset component="dataminer-pool-manager.2-5-0" date="$***REMOVED***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="$***REMOVED***buildDate***REMOVED***">
<Change>Notifies the 'conflicts' on SVN</Change>

2
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/Configuration.java
View File

@ -25,6 +25,8 @@ public interface Configuration ***REMOVED***
public String getSVNPythonDepsList();
public String getSVNPython3_6DepsList();
public String getSVNWCDepsList();
public SVNRepository getSVNRepository();

8
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java
View File

@ -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***

10
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configurations/AbstractConfiguration.java
View File

@ -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
"<deps-knime-workflow>***REMOVED***$resource/Profile/Body/"+type+"/deps-knime-workflow/text()***REMOVED***</deps-knime-workflow >"+
"<deps-octave>***REMOVED***$resource/Profile/Body/"+type+"/deps-octave/text()***REMOVED***</deps-octave>"+
"<deps-python>***REMOVED***$resource/Profile/Body/"+type+"/deps-python/text()***REMOVED***</deps-python>"+
"<deps-python3_6>***REMOVED***$resource/Profile/Body/"+type+"/deps-python3_6/text()***REMOVED***</deps-python3_6>"+
"<deps-windows-compiled>***REMOVED***$resource/Profile/Body/"+type+"/deps-windows-compiled/text()***REMOVED***</deps-windows-compiled></"+type+">";
***REMOVED***

2
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java
View File

@ -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":