Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e3cdfa8
incluye travis
carmenJaraAlvarez Jan 3, 2019
945327a
modificado travis
carmenJaraAlvarez Jan 3, 2019
b80c6d6
Nuevo cambio en travis
carmenJaraAlvarez Jan 3, 2019
a1f0e35
otro
carmenJaraAlvarez Jan 3, 2019
21de88c
n
carmenJaraAlvarez Jan 3, 2019
c0bce58
n+1
carmenJaraAlvarez Jan 3, 2019
0a58b4c
n+2
carmenJaraAlvarez Jan 3, 2019
bb1259b
sin dos test
carmenJaraAlvarez Jan 3, 2019
ab447f8
Modificado readme en rama nueva
carmenJaraAlvarez Jan 3, 2019
bba2367
Merge pull request #1 from carmenJaraAlvarez/rama
carmenJaraAlvarez Jan 4, 2019
2569d18
travis en readme
carmenJaraAlvarez Jan 4, 2019
a8ed191
Merge branch 'master' of https://github.com/carmenJaraAlvarez/decide
carmenJaraAlvarez Jan 4, 2019
2677f94
notificaciones travis
carmenJaraAlvarez Jan 4, 2019
a63c572
nueva configuracion notificaciones travis
carmenJaraAlvarez Jan 4, 2019
ef9714a
travis con distintas versiones
carmenJaraAlvarez Jan 4, 2019
e6272ea
distintas versiones django en travis
carmenJaraAlvarez Jan 4, 2019
ea80a64
nuevo
carmenJaraAlvarez Jan 4, 2019
4fc3746
modificado requirements
carmenJaraAlvarez Jan 4, 2019
0c79a36
heroku
carmenJaraAlvarez Jan 4, 2019
2f6cd83
https heroku modificado
carmenJaraAlvarez Jan 4, 2019
4cb432d
prueba
carmenJaraAlvarez Jan 4, 2019
2cbe01d
heroku
carmenJaraAlvarez Jan 4, 2019
3ff1cd6
otro
carmenJaraAlvarez Jan 4, 2019
cd20108
travis
carmenJaraAlvarez Jan 5, 2019
25e2101
sin test
carmenJaraAlvarez Jan 5, 2019
7778b79
or
carmenJaraAlvarez Jan 5, 2019
655e820
kk
carmenJaraAlvarez Jan 5, 2019
2bbeff6
sin hero
carmenJaraAlvarez Jan 5, 2019
3bcf09c
kkl
carmenJaraAlvarez Jan 5, 2019
05f6c08
gg
carmenJaraAlvarez Jan 5, 2019
bdff1bd
h
carmenJaraAlvarez Jan 5, 2019
67aa6ed
bbljhgyg
carmenJaraAlvarez Jan 5, 2019
1af4997
jjgvigv
carmenJaraAlvarez Jan 5, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
language: python
python: 3.6
services:
- postgresql
env:
- DJANGO=2.0 DB=postgres
global:
- PGPORT=5432
before_install:
- cd decide
install:
- pip install -r ../requirements.txt
before_script:
- psql -c "create user decide with password 'decide'"
- psql -c "create database decide owner decide"
- python manage.py migrate
script:
- python manage.py test
addons:
postgresql: "9.6"
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
https://travis-ci.org/carmenJaraAlvarez/decide.svg?branch=master

Plataforma voto electrónico educativa
=====================================

Expand Down
9 changes: 6 additions & 3 deletions decide/decide/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
'rest_framework.authtoken',
'rest_framework_swagger',
]

# APIS = {}
REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication',
Expand All @@ -68,8 +68,8 @@
'voting',
]

BASEURL = 'http://localhost:8000'

#BASEURL = 'https://decidepropio.herokuapp.com'
BASEURL = 'http://localhost:8000/'
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
Expand Down Expand Up @@ -160,3 +160,6 @@


INSTALLED_APPS = INSTALLED_APPS + MODULES

# import django_heroku
# django_heroku.settings(locals())
38 changes: 38 additions & 0 deletions decide/local_settings.travis.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
ALLOWED_HOSTS = ["*"]

MODULES = [
'authentication',
'base',
'booth',
'census',
'mixnet',
'postproc',
'store',
'visualizer',
'voting',
]

APIS = {
'authentication': 'http://localhost:8000',
'base': 'http://localhost:8000',
'booth': 'http://localhost:8000',
'census': 'http://localhost:8000',
'mixnet': 'http://localhost:8000',
'postproc': 'http://localhost:8000',
'store': 'http://localhost:8000',
'visualizer': 'http://localhost:8000',
'voting': 'http://localhost:8000',
}

BASEURL = 'http://localhost:8000'

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'decide',
'USER': 'decide',
'HOST': 'localhost',
'PORT': '5432',
}
}
KEYBITS = 256
2 changes: 1 addition & 1 deletion decide/manage.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import os
import sys

Expand Down
Loading