G2-feature/Visualizer

.gitignore

@@ -24,7 +24,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-
+decide-enviroment/
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -45,6 +45,8 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+loadtest/gen_census.py
+loadtest/locustfile.py
 
 # Translations
 *.mo

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "configurations": [
+        {
+            "name": "Python: Django",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/decide/manage.py",
+            "args": [
+                "runserver",
+                "0.0.0.0:8000"
+            ],
+            "django": true,
+            "justMyCode": false,
+        }
+    ]
+}

Jenkinsfile

@@ -0,0 +1,84 @@
+pipeline {
+    agent { docker { image 'python:3.7.2' } }
+
+    stages {
+        stage('Build Master') {
+            when {
+                branch 'master' 
+            }
+            steps {
+                sh '''
+                pip install -r requirements.txt
+
+                cd decide
+                ./manage.py test -v 2
+                '''
+            }
+        }
+
+        stage('Deploy Master') {
+            when {
+                branch 'master' 
+            }
+            steps {
+                /* Llamamos a Heroku y a darle caña */
+            }
+        }
+
+        stage('Build Develop') {
+            when {
+                branch 'develop' 
+            }
+            steps {
+                sh '''
+                pip install -r requirements.txt
+
+                cd decide
+                ./manage.py test -v 2
+                '''
+            }
+        }
+
+        stage('Build G1') {
+            when {
+                branch 'G1' 
+            }
+            steps {
+                sh '''
+                pip install -r requirements.txt
+
+                cd decide
+                ./manage.py test authentication -v 2
+                '''
+            }
+        }
+
+        stage('Build G2') {
+            when {
+                branch 'G2' 
+            }
+            steps {
+                sh '''
+                pip install -r requirements.txt
+
+                cd decide
+                ./manage.py test booth -v 2
+                '''
+            }
+        }
+
+        stage('Build G3') {
+            when {
+                branch 'G3' 
+            }
+            steps {
+                sh '''
+                pip install -r requirements.txt
+
+                cd decide
+                ./manage.py test voting -v 2
+                '''
+            }
+        }
+    }
+}

Procfile

@@ -0,0 +1,4 @@
+% prepara el repositorio para su despliegue. 
+release: sh -c 'cd decide && python manage.py migrate'
+% especifica el comando para lanzar Decide
+web: sh -c 'cd decide && gunicorn decide.wsgi --log-file -'

README.md

@@ -1,7 +1,6 @@
 [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
-
+Prueba de commit 7
 Plataforma voto electrónico educativa
-=====================================
 
 El objetivo de este proyecto es implementar una plataforma de voto
 electrónico seguro, que cumpla una serie de garantías básicas, como la

decide/decide/settings.py

@@ -1,11 +1,8 @@
 """
 Django settings for decide project.
-
 Generated by 'django-admin startproject' using Django 2.0.
-
 For more information on this file, see
 https://docs.djangoproject.com/en/2.0/topics/settings/
-
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/2.0/ref/settings/
 """
@@ -179,4 +176,6 @@
         vars()[k] = v
 
 
+
 INSTALLED_APPS = INSTALLED_APPS + MODULES
+