Merge branch 'master' into setup_improve

Author: cTatu

.gitattributes

@@ -47,7 +47,7 @@ If applicable, add screenshots to help explain your problem.
 **Environment (please complete the following information):**
  - OS: [e.g. linux mint]
  - Version [e.g. 18]
- - COMPSs version [e.g. 2.7]
+ - COMPSs version [e.g. 2.8]
  - Dislib version [e.g. 0.1.0]
  - Java / Python versions [e.g. java 8 / python 3.6.4]
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,6 +8,9 @@ compss/runtime/config/xml/projects/src/main/java/es/bsc/compss/types/project/jax
 compss/runtime/config/xml/resources/src/main/java/META-INF/
 compss/runtime/config/xml/resources/src/main/java/es/bsc/compss/types/resources/jaxb/
 
+# Ignore virtual environment files
+venv/
+
 # Ignore eclipse files
 .classpath
 .settings/
@@ -109,6 +112,7 @@ target/
 *compss*.out
 *compss*.err
 
+
 # ========== C & C++ ignores =================
 # Prerequisites
 *.d
@@ -171,3 +175,5 @@ dkms.conf
 # Ignore log files
 *.log
 
+# Ignore virtual environments
+venv

.gitignore

@@ -4,6 +4,10 @@ MAINTAINER COMPSs Support <[email protected]>
 COPY . dislib/
 
 ENV PYTHONPATH=$PYTHONPATH:/dislib
+ENV LC_ALL=C.UTF-8
+RUN python3 -m pip install --upgrade -r /dislib/requirements.txt
+
+ENV COMPSS_LOAD_SOURCE false
 
 # Expose SSH port and run SSHD
 EXPOSE 22

.travis.yml

@@ -0,0 +1,65 @@
+def setGithubCommitStatus(state, description) {
+    withEnv(["STATE=$state", "DESCRIPTION=$description"]) {
+         withCredentials([string(credentialsId: 'Compsupescalar Github secret token', variable: 'GITHUB_TOKEN')]) {
+            sh 'curl -H "Authorization: token $GITHUB_TOKEN" -X POST \
+            --data  "{\\"state\\": \\"$STATE\\", \\"description\\": \\"$DESCRIPTION\\", \
+            \\"target_url\\": \\"${BUILD_URL}\\", \\"context\\": \\"continuous-integration/jenkins\\" }" \
+            --url https://api.github.com/repos/bsc-wdc/dislib/statuses/${GIT_COMMIT}'
+        }
+    }
+}
+
+pipeline {
+    options {
+        timeout(time: 5, unit: 'HOURS')
+    }
+    agent {
+        node {
+            label 'Docker'
+        }
+    }
+    stages {
+        stage('build') {
+            steps {
+                setGithubCommitStatus('pending', 'The Jenkins build is in progress')
+                sh 'git pull origin'
+                sh 'docker rm -f dislib &> /dev/null || true'
+                sh 'docker rmi -f bscwdc/dislib &> /dev/null || true'
+                sh 'docker build --pull --no-cache --tag bscwdc/dislib .'
+                sh '''#!/bin/bash
+                docker run $(bash <(curl -s https://codecov.io/env)) -d --name dislib bscwdc/dislib'''
+            }
+        }
+        stage('test') {
+            steps {
+                sh 'docker exec dislib /dislib/run_ci_checks.sh'
+            }
+        }
+        stage('deploy') {
+            when {
+                branch 'master'
+            }
+            steps {
+                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId:'dockerhub_compss', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+                    sh 'docker login -u "$USERNAME" -p "$PASSWORD"'
+                }
+                sh 'docker tag bscwdc/dislib bscwdc/dislib:latest'
+                sh 'docker push bscwdc/dislib:latest'
+            }
+        }
+    }
+    post{
+        always {
+            sh 'docker exec dislib /dislib/bin/print_tests_logs.sh'
+            sh 'docker images'
+            sh 'docker rm -f dislib &> /dev/null || true'
+            sh 'docker rmi -f bscwdc/dislib &> /dev/null || true'
+        }
+        success {
+            setGithubCommitStatus('success', 'Build Successful')
+        }
+        failure {
+            setGithubCommitStatus('failure', 'Build Failure')
+        }
+    }
+}

Dockerfile

@@ -10,7 +10,7 @@ ready-to-use [docker image](#using-docker).
 
 dislib currently requires:
 
-* PyCOMPSs >= 2.7
+* PyCOMPSs >= 2.8
 * Scikit-learn >= 0.19.1
 * Scipy >= 1.0.0
 * NumPy >= 1.15.4
@@ -22,9 +22,9 @@ numpydoc >= 0.8.0 is requried to build the documentation.
 #### Installation steps 
 
 1. Check which PyCOMPSs version to install. 
-    * Latest dislib release requires **PyCOMPSs 2.7** or greater (check [here](https://github.com/bsc-wdc/dislib/releases) for information about other releases).
+    * Latest dislib release requires **PyCOMPSs 2.8** or greater (check [here](https://github.com/bsc-wdc/dislib/releases) for information about other releases).
 
-2. Install PyCOMPSs following these [instructions](https://compss-doc.readthedocs.io/en/2.7/Sections/01_Installation.html).
+2. Install PyCOMPSs following these [instructions](https://compss-doc.readthedocs.io/en/stable/Sections/01_Installation.html).
 
 3. Install the latest dislib version with ``pip3 install dislib``.
    * **IMPORTANT:** dislib requires the ``pycompss`` Python module. However, this command will **NOT** install the module automatically. The module should be available after manually installing PyCOMPSs following the instructions in step 2. For more information on this, see [here](https://github.com/bsc-wdc/dislib/issues/190).

Jenkinsfile

@@ -10,8 +10,8 @@
     <img src="https://readthedocs.org/projects/dislib/badge/?version=stable"
          alt="Documentation Status"/>
   </a>  
-  <a href="https://travis-ci.org/bsc-wdc/dislib">
-    <img src="https://travis-ci.org/bsc-wdc/dislib.svg?branch=master"
+  <a href="https://github.com/bsc-wdc/dislib">
+    <img src="https://compss.bsc.es/jenkins/buildStatus/icon?job=dislib_multibranch%2Fmaster"
          alt="Build Status">
   </a> 
   <a href="https://codecov.io/gh/bsc-wdc/dislib">
@@ -22,7 +22,7 @@
       <img src="https://badge.fury.io/py/dislib.svg" alt="PyPI version" height="18">
   </a>   
   <a href="https://badge.fury.io/py/dislib">
-      <img src="https://img.shields.io/badge/python-3.5-blue.svg" alt="Python version" height="18">
+      <img src="https://img.shields.io/badge/python-3.6-blue.svg" alt="Python version" height="18">
   </a>       
 </p>
 

QUICKSTART.md

@@ -1 +1 @@
-0.6.4
+0.7.0

README.md

@@ -0,0 +1,20 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "90...100"
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,files,footer"
+  behavior: default
+  require_changes: no