Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1132 commits
Select commit Hold shift + click to select a range
0fff733
Support for Unicode-characters (UTF-8) in usernames when logging into…
helgihg Feb 23, 2019
d4f964b
Version: 0.11.0 -> 0.11.1
helgihg Feb 23, 2019
90e79da
Merge remote-tracking branch 'origin'
helgihg Feb 23, 2019
3fd2ba5
IcePirate and SAML 1 settings added to env.example.
helgihg Feb 23, 2019
838c34b
Tasks: Seemingly unfinished options, categories and skills, removed f…
helgihg May 7, 2019
afc9c90
Version: 0.11.1 -> 0.11.2
helgihg May 7, 2019
6b9581d
Merge remote-tracking branch 'origin'
helgihg May 7, 2019
67311e9
Default from email address added to settings.
helgihg May 31, 2019
3eecb8b
Version: 0.11.2 -> 0.11.3
helgihg May 31, 2019
d9d85ac
Merge remote-tracking branch 'origin'
helgihg May 31, 2019
97089f9
Declaration of interests field added to user profile.
helgihg Jul 23, 2019
1011bb3
Translation: Icelandic
helgihg Jul 23, 2019
cac7f61
Version: 0.11.3 -> 0.11.4
helgihg Jul 23, 2019
f5e6cc8
Merge branch 'development'
helgihg Jul 23, 2019
5085a0f
Declaration of interests added to user profile page.
helgihg Jul 23, 2019
51813ca
Version: 0.11.4 -> 0.11.5
helgihg Jul 23, 2019
273081c
Merge branch 'development'
helgihg Jul 23, 2019
18b30a8
Code style consistency.
helgihg Jul 23, 2019
f0b5d24
User task listing fixed, optimized and code made a bit more consistent.
helgihg Jul 30, 2019
9742e56
Edit-button enabled for tasks if user is wrangler.
helgihg Jul 30, 2019
19f2310
User is automatically a wrangler of a polity if he/she is an officer …
helgihg Jul 30, 2019
3471a3e
Edit-button not shown for completed tasks.
helgihg Jul 30, 2019
aa941bf
Ability to delete tasks.
helgihg Jul 30, 2019
f9c4088
Name of application in application listing turned into link.
helgihg Jul 30, 2019
28b3a52
Translation improvements (in code).
helgihg Jul 30, 2019
a094b48
Translation: Icelandic
helgihg Jul 30, 2019
4063c22
Translation improvement.
helgihg Jul 30, 2019
4a69ad6
Translation: Icelandic
helgihg Jul 30, 2019
d277339
Version: 0.11.5 -> 0.11.6
helgihg Jul 30, 2019
9fac14e
Merge branch 'development'
helgihg Jul 30, 2019
4c8ab87
Missing migration added.
helgihg Jul 30, 2019
baedc38
Version: 0.11.6 -> 0.11.7
helgihg Jul 30, 2019
82fcbec
Merge branch 'development'
helgihg Jul 30, 2019
1fb335e
Fixed: Task detail assumed that user was logged in.
helgihg Jul 30, 2019
b1f20e7
Translation: Icelandic
helgihg Jul 30, 2019
37165f3
Markdown displaying fix.
helgihg Jul 30, 2019
c171d21
Version: 0.11.7 -> 0.11.8
helgihg Jul 30, 2019
4507a4a
Merge branch 'development'
helgihg Jul 30, 2019
b9745ef
Entry for applicant's available time added to task request.
helgihg Jul 30, 2019
3be58f3
Translation: Icelandic
helgihg Jul 30, 2019
157a414
Version: 0.11.8 -> 0.11.9
helgihg Jul 30, 2019
580164f
Merge branch 'development'
helgihg Jul 30, 2019
2d296c0
Password reset email given both an HTML and text version.
helgihg Jul 31, 2019
5b4c572
Minor: Phrasing improved on one button.
helgihg Jul 31, 2019
3a41680
django_mdmail included and applied to password-reset emails. Password…
helgihg Jul 31, 2019
6ab9279
Prior Markdown text bolding test removed, which was included by mistake.
helgihg Jul 31, 2019
d2a05bc
Translation: Icelandic
helgihg Jul 31, 2019
ded9fff
Docker database port fix: should be 3306 (mysql)
viktorsmari Jul 31, 2019
396d396
Add mdmail package to requirements.txt
viktorsmari Jul 31, 2019
d6e6ac6
More email settings added read in settings.py from .env.
helgihg Aug 3, 2019
1499240
Email subject prefix configurable via environment variable.
helgihg Aug 5, 2019
5f0119c
Ability to change email, with confirmation email being sent, and IceP…
helgihg Aug 5, 2019
73b8966
Translation: Icelandic
helgihg Aug 5, 2019
690c294
Removed long-since outdated and confusing INSTALL.Debian.txt file.
helgihg Aug 5, 2019
4f06742
Command for exporting database but with personal data removed, for tr…
helgihg Aug 19, 2019
698f89c
Version: 0.11.9 -> 0.11.10
helgihg Aug 19, 2019
a105818
Merge remote-tracking branch 'origin'
helgihg Aug 19, 2019
7124b79
Required Django version updated.
helgihg Aug 20, 2019
c41d3e9
Abstentions in issues not shown with vote count until after issue is …
helgihg Aug 20, 2019
1d887a7
CSS: Date fields made not to wrap.
helgihg Aug 22, 2019
13b89b5
Election listing on user profile fixed in various ways an made more a…
helgihg Aug 22, 2019
8c8373e
L10N turned off so that datetime settings rule the show.
helgihg Aug 22, 2019
7059648
Translation: Icelandic
helgihg Aug 22, 2019
40d14f2
Version: 0.11.10 -> 0.11.11
helgihg Aug 22, 2019
716eaa8
Merge remote-tracking branch 'origin'
helgihg Aug 22, 2019
e7e208d
User's polity listing only visible to user itself.
helgihg Aug 22, 2019
e6491fc
Version: 0.11.11 -> 0.11.12
helgihg Aug 22, 2019
d6c7307
Merge remote-tracking branch 'origin'
helgihg Aug 22, 2019
1191cc4
Tabs to spaces for conformity with PIP8.
helgihg Aug 23, 2019
618f238
SAML 1.2 removed and replaced with a new and shiny SAML 2.0 mechanism.
helgihg Aug 26, 2019
7db7591
Version: 0.11.12 -> 0.11.13
helgihg Aug 26, 2019
e04552e
Merge remote-tracking branch 'origin'
helgihg Aug 26, 2019
388fecf
CustomTermsAndConditionsRedirectMiddleware replaced with one from dja…
helgihg Aug 27, 2019
9693b7b
IcePirate support: Email on IcePirate's side updated if it doesn't ma…
helgihg Aug 29, 2019
071e763
Minor: A more useful message for the email field in user settings.
helgihg Aug 29, 2019
9aa39a6
IcePirate registration no longer automatically created upon successfu…
helgihg Aug 29, 2019
e2296df
User's phone number configurable in user settings.
helgihg Aug 29, 2019
c69b0ea
Translation: Icelandic
helgihg Aug 29, 2019
535a144
Various improvements, optimizations and cleanup in tasks.
helgihg Aug 31, 2019
218fcd3
Translation: Icelandic
helgihg Aug 31, 2019
4b94dec
Docker: db container exposes port 3306 to host
viktorsmari Aug 31, 2019
acd3f0c
Task navigation fixed.
helgihg Aug 31, 2019
498add7
Readme cleanup for virtualenv / docker
viktorsmari Aug 31, 2019
539b8a8
Merge branch 'development' of github.com:piratar/wasa2il into develop…
viktorsmari Aug 31, 2019
7b8e34f
Readme spacing
viktorsmari Aug 31, 2019
c1a9ca6
Travis: create .env file so DotEnv does not fail
viktorsmari Sep 1, 2019
35220c5
Various fixes to tasks, including field renames.
helgihg Sep 1, 2019
64ffe65
Polity setting (default on) allows for requiring volunteers to provid…
helgihg Sep 1, 2019
32a7b83
Translation: Icelandic
helgihg Sep 1, 2019
2eb6361
gitignore coverage.xml file
viktorsmari Sep 1, 2019
617c040
Merge branch 'development' of github.com:piratar/wasa2il into develop…
viktorsmari Sep 1, 2019
fecdbd7
Travis: create W2_SECRET_KEY to suppress warning
viktorsmari Sep 1, 2019
5dc478a
Template mistake fixed.
helgihg Sep 1, 2019
608eb53
Config: Default DB variables made less confusing
viktorsmari Sep 1, 2019
2d6fc3c
Merge branch 'development' of github.com:piratar/wasa2il into develop…
viktorsmari Sep 1, 2019
35802f0
Tasks: Minor cosmetics.
helgihg Sep 1, 2019
ae78b26
Translation: Icelandic
helgihg Sep 1, 2019
6d1f135
Phone requirement setting for volunteers in tasks moved from polity t…
helgihg Sep 1, 2019
8cbf1eb
Translation: Icelandic
helgihg Sep 1, 2019
7c1e1c3
Travis heroku: run migrate
viktorsmari Sep 1, 2019
8675c2c
Mobiles: use more of the space on the sides.
viktorsmari Sep 1, 2019
504b44f
Readme: CSS management
viktorsmari Sep 1, 2019
1c7bb79
Version: 0.11.13 -> 0.11.14
helgihg Sep 3, 2019
ff6832b
Merge remote-tracking branch 'origin'
helgihg Sep 3, 2019
1c49e9b
Clicking the star in topics table is now possible
viktorsmari Sep 4, 2019
36b076d
Tests: Check HTTP Status codes + user log in
viktorsmari Sep 5, 2019
9b799f8
load_fake_data: Fixed data entry into DurationField (total_seconds) p…
helgihg Sep 8, 2019
c06f97b
load_fake_data: Transaction-compatibility fixed.
helgihg Sep 8, 2019
3bc9234
Stupid type fixed, which made demo users unable to vote.
helgihg Sep 8, 2019
7f09e91
Readme update
viktorsmari Sep 8, 2019
dd0a128
Tasks: User automatically redirected to task after having set phone i…
helgihg Oct 19, 2019
e38551d
Translation: Icelandic
helgihg Oct 19, 2019
4522a47
ProseMirror removed since it's currently creating problems instead of…
helgihg Oct 19, 2019
656559c
Push notification JavaScript stuff disabled and feature knob off.
helgihg Oct 22, 2019
1d818b7
Oops! Python!
helgihg Oct 22, 2019
8fc737c
Updates for Python 3+ and Django 2+ compatibility.
helgihg Jan 18, 2020
c0bd752
Version: 0.11.14 -> 0.11.15
helgihg Jan 18, 2020
2070c2f
Merge remote-tracking branch 'origin'
helgihg Jan 18, 2020
dc8d18d
Django 2.x update: Password-reset-done view added to urlconf.
helgihg Jan 19, 2020
4bc4e0d
Update for Python 3: Unnecessary use of unicode() function removed.
helgihg Jan 21, 2020
85d4b0b
Python 3 / Django 2 fixes.
helgihg Jan 21, 2020
2cd6e30
Exception thrown on error in communication with IcePirate, to reflect…
helgihg Jan 21, 2020
40d4cfc
Version: 0.11.15 -> 0.11.16
helgihg Jan 21, 2020
a41feae
Merge remote-tracking branch 'origin'
helgihg Jan 21, 2020
1a9c8b2
Missing (non-critical) migration added.
helgihg Jan 21, 2020
f724708
Merge remote-tracking branch 'origin'
helgihg Jan 21, 2020
aa73fe4
Python 3 updates: Discourse SSO fixed.
helgihg Jan 21, 2020
b34c8bc
Merge remote-tracking branch 'origin'
helgihg Jan 21, 2020
1247681
Version: 0.11.16 -> 0.11.17
helgihg Jan 22, 2020
01e89fd
Merge remote-tracking branch 'origin'
helgihg Jan 22, 2020
b1197be
Errors logged to file now, so that those investigating errors don't n…
helgihg Feb 21, 2020
84922dc
Merge remote-tracking branch 'origin'
helgihg Feb 21, 2020
3f8a6bd
Bugfix: Forgotten-password email respects content-type and thus no lo…
helgihg Feb 22, 2020
54d0894
Merge remote-tracking branch 'origin'
helgihg Feb 22, 2020
1f8abb1
Bugfix: Login with email or SSN supported again. Misleading instructi…
helgihg Feb 22, 2020
3c71634
Translation: Icelandic
helgihg Feb 22, 2020
1bce1c2
Contact email configurable instead of hard-coded.
helgihg Feb 22, 2020
40f24d4
Version: 0.11.17 -> 0.11.18
helgihg Feb 22, 2020
824075c
Merge remote-tracking branch 'origin'
helgihg Feb 22, 2020
ce59a28
Sync with IcePirate fixed.
helgihg Mar 12, 2020
469949e
Merge remote-tracking branch 'origin'
helgihg Mar 12, 2020
fca0e7c
Version: 0.11.18 -> 0.11.19
helgihg Mar 12, 2020
f62624c
Merge remote-tracking branch 'origin'
helgihg Mar 12, 2020
543fb44
Image upload fixed.
helgihg Sep 6, 2020
8bfda66
Version: 0.11.19 -> 0.11.20
helgihg Sep 6, 2020
7ae4383
Merge branch 'development'
helgihg Sep 6, 2020
114209a
STV-6 added.
helgihg Sep 8, 2020
5baa185
Translation: Icelandic
helgihg Sep 8, 2020
abd8fc9
Version: 0.11.20 -> 0.11.21
helgihg Sep 8, 2020
042a79c
Merge branch 'development'
helgihg Sep 8, 2020
03bb6eb
Only specifically listed polities shown in side navigation.
helgihg Sep 9, 2020
642960b
Merge branch 'development'
helgihg Sep 9, 2020
67201c9
Crash fixed when a polity is unlisted with a listed subpolity.
helgihg Sep 9, 2020
1cad5be
Merge branch 'development'
helgihg Sep 9, 2020
f94a78a
API (JSON) for retrieving recent elections and issues.
helgihg Sep 9, 2020
430e92c
Missing migration added (shouldn't change anything functionally).
helgihg Sep 9, 2020
e959d7c
Merge branch 'development'
helgihg Sep 9, 2020
3e3dcf7
Polities ordered by a special order number, or name when the order is…
helgihg Sep 9, 2020
cb4e140
Translation: Icelandic
helgihg Sep 9, 2020
b3037b6
Merge branch 'development'
helgihg Sep 9, 2020
36c6bc1
Fields made translatable.
helgihg Sep 11, 2020
22f327b
Translation: Icelandic
helgihg Sep 11, 2020
de80ca3
Bugfix: Elections in API showing wrong polity.
helgihg Sep 14, 2020
11de746
Merge branch 'development'
helgihg Sep 14, 2020
13bc6d5
Missing (non-critical) migration added.
helgihg Sep 14, 2020
c03030b
Merge branch 'development'
helgihg Sep 14, 2020
112943f
A short-name field added to polity and placed in the API output.
helgihg Sep 14, 2020
a60066b
Translation: Icelandic
helgihg Sep 14, 2020
579c2fc
Merge branch 'development'
helgihg Sep 14, 2020
4f305f5
Update processelections.py
BjarniRunar Sep 27, 2020
31d02bc
Update models.py
BjarniRunar Sep 27, 2020
ce0c428
Banner and header design change.
helgihg Oct 24, 2020
ebbe969
Support for a news site URL prominently displayed with user action bu…
helgihg Oct 24, 2020
b30c7e3
Translation: Icelandic.
helgihg Oct 24, 2020
6fd0b22
Custom help text on username field in registration view.
helgihg Oct 24, 2020
0845bde
Translation: Icelandic.
helgihg Oct 24, 2020
027a067
Version: 0.11.21 -> 0.11.22
helgihg Oct 24, 2020
04ec756
Merge remote-tracking branch 'origin' into master
helgihg Oct 24, 2020
c0e06d6
Merge pull request #238 from piratar/BjarniRunar-patch-2
helgihg Jan 7, 2021
6be72e2
Merge pull request #237 from piratar/BjarniRunar-patch-1
helgihg Jan 7, 2021
faff5ba
Information explaining how people can change their membership details…
helgihg Jan 7, 2021
6f0de22
Translation: Icelandic
helgihg Jan 7, 2021
a43298a
Merge remote-tracking branch 'origin'
helgihg Jan 7, 2021
c3f71fb
Version: 0.11.22 -> 0.11.23
helgihg Jan 7, 2021
fbb4f1d
Merge branch 'development'
helgihg Jan 7, 2021
b7097f2
render_to_response -> render for Django 3.x compat
smari Jan 16, 2021
20693b2
NullBooleanField to null BooleanField for future Django compat
smari Jan 16, 2021
68e0085
Show subpolity elections in election list
smari Jan 16, 2021
c572762
Subpolity navigation
smari Jan 16, 2021
7e2bfa4
Hide subpolity list if no subpolities
smari Jan 16, 2021
23a459f
Make subpolity list responsive
smari Jan 16, 2021
df7b7bf
Stop candidate list from jumping
smari Jan 16, 2021
d8d6546
Ability to apply for membership of polities that membership registry …
helgihg Jan 18, 2021
c69c133
Migration merge to fix conflicting migration.
helgihg Jan 18, 2021
a7be6a2
Polity's short name and eligibles made optional.
helgihg Jan 18, 2021
3f959a6
Stop candidate list from jumping
smari Jan 16, 2021
45ec064
Compatibility library django-utils-six added to requirements.txt. May…
helgihg Jan 18, 2021
737e71a
Merge branch 'development' of github.com:piratar/wasa2il into develop…
helgihg Jan 18, 2021
cb74e32
Updated terms-and-conditions templates for Django 3.1.
helgihg Jan 18, 2021
8a9b6c0
Improvements to sub-polity navigation code.
helgihg Jan 19, 2021
7415cab
Short-names of polities shown in elections of sub-polities when appro…
helgihg Jan 19, 2021
f765e1e
"Show previous elections" button fixed to include sub-polities.
helgihg Jan 19, 2021
dd05782
Translation: Icelandic
helgihg Jan 19, 2021
5e6e380
Outdated and misleading instructions commented out until they've been…
helgihg Jan 19, 2021
0aeefbf
Updated Travis config: Python 3.7 instead of 2.7.
helgihg Jan 19, 2021
44e878b
requirements.txt: Adding `coverage`.
helgihg Jan 19, 2021
582ead9
Ancient, outdated and fantastically dangerous custom command removed.
helgihg Jan 19, 2021
04e4844
Fake data loader at least upgraded to Python 3. Might still not work …
helgihg Jan 19, 2021
9758ba3
Travis: Install MySQL module.
helgihg Jan 19, 2021
4d28a4f
Create python-app.yml
viktorsmari Jan 19, 2021
28596c0
Use python 3.7
viktorsmari Jan 19, 2021
5b2be37
GHA: dont run lint
viktorsmari Jan 19, 2021
86f5806
GHA: Run test (copied from .travis.yml)
viktorsmari Jan 19, 2021
0e0f566
GHA: add env vars
viktorsmari Jan 19, 2021
938683b
GHA: Update env var
viktorsmari Jan 19, 2021
b4aea73
Update python-app.yml
viktorsmari Jan 19, 2021
397acee
Recommend using python3 venv
viktorsmari Jan 19, 2021
559af5e
Merge branch 'development' of github.com:piratar/wasa2il into develop…
viktorsmari Jan 19, 2021
2d57740
GHA: add mysql service
viktorsmari Jan 19, 2021
5204733
GHA: db port
viktorsmari Jan 19, 2021
667fcbe
Dockerfile use Python 3
viktorsmari Jan 19, 2021
0b7dfee
GHA: skip coverage xml
viktorsmari Jan 19, 2021
50243ed
Version: 0.11.23 -> 0.12.0
helgihg Jan 19, 2021
bb0dea1
Merge remote-tracking branch 'origin'
helgihg Jan 19, 2021
d7a034e
GHA: deploy to Heroku if job.status == success
viktorsmari Jan 19, 2021
4c43f42
Merge branch 'development' of github.com:piratar/wasa2il into develop…
viktorsmari Jan 19, 2021
eaf0e75
GHA: push to origin/development
viktorsmari Jan 19, 2021
117a396
GHA: heroku deploy action
viktorsmari Jan 19, 2021
d7af391
GHA: syntax fix
viktorsmari Jan 19, 2021
80a2d3c
GHA: Remove flake8
viktorsmari Jan 19, 2021
b5b6961
Update runtime.txt Python version from 2.7 -> 3.8
viktorsmari Jan 19, 2021
76f7e97
Bump runtime.txt 3.8.7 for Heroku
viktorsmari Jan 19, 2021
3a4cebd
runtime.txt lowercase
viktorsmari Jan 19, 2021
80f5aca
Docker cleanup / rename
viktorsmari Jan 20, 2021
a66a8d4
Remove coverage, add gunicorn
viktorsmari Jan 20, 2021
5f064c8
GHA: remove coverage
viktorsmari Jan 20, 2021
5b3b1c4
GHA: add python in command
viktorsmari Jan 20, 2021
59948bb
Add dj_database_url for Heroku
viktorsmari Jan 20, 2021
8e1c25a
Heroku: install psql adapter
viktorsmari Jan 20, 2021
0b786d9
Additional authentication security tests
smari Jan 28, 2021
f5f4b81
Fixup
smari Jan 28, 2021
ac5e928
Some Danish fixed.
helgihg Jan 29, 2021
a3e49fa
Return bad request when request is bad.
smari Jan 29, 2021
5ee9bfb
Problematic order of middlewares fixed.
helgihg Feb 1, 2021
64c1194
Update django.po
bjornlevi Feb 23, 2021
f54fa69
Login page indicates the possibility that SAML verification is needed…
helgihg Jul 23, 2021
3fa1d37
Translation: Icelandic
helgihg Jul 23, 2021
4a8314e
New cert from island.is.
helgihg Jul 23, 2021
767a850
Version: 0.12.0 -> 0.12.1
helgihg Jul 23, 2021
766c15c
Merge branch 'development'
helgihg Jul 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 54 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Python application

on:
push:
branches: [ development ]
pull_request:
branches: [ development ]

jobs:
build:

runs-on: ubuntu-latest

services:
mysql:
image: mysql:5.7
env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
#MYSQL_DATABASE: laravel_tags
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest mysqlclient
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Run tests
run: |
python manage.py test -v 2
env:
W2_DATABASE_HOST: 127.0.0.1
W2_DATABASE_PORT: ${{ job.services.mysql.ports[3306] }}
W2_DATABASE_PASSWORD:
W2_DATABASE_USER: root
W2_SECRET_KEY: supersecretkey-only-used-for-testing

- name: Deploy to heroku
uses: akhileshns/heroku-deploy@v3.8.9 # This is the action
with:
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: 'wasa2il-development'
heroku_email: ${{ secrets.MY_EMAIL }}
branch: 'development'
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
*.pyc
# Generated by django compilemessages utility
*.mo
wasa2il/locale/wasa2il.pot
*.swp
*.swo
pip-selfcheck.json
bin
include
lib/python2.7
lib/
local
share
.idea
wasa2il/wasa2il.sqlite
wasa2il.sqlite
*~
venv/
reports/*
!reports/index.html
.coverage
.sass-cache
.env
*.sqlite
coverage.xml
errors.log
63 changes: 63 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
image: docker:git
services:
- docker:dind

stages:
- build
- test
- deploy
- release

variables:
CONTAINER_RELEASE_IMAGE: registry.gitlab.com/piratar/wasa2il/image:latest

build:
stage: build
image: python:2-onbuild
script:
- echo "This is where we build it..."

test:
stage: test
image: python:2-onbuild
script:
- pip install -r requirements.txt
- coverage run --source=. manage.py test -v 2
- coverage html
- flake8 --htmldir reports/flake8 --format=html -v
artifacts:
paths:
- reports/

pages:
stage: deploy
script:
- mv reports/ public/
artifacts:
paths:
- public

staging:
stage: deploy
only:
- master
script:
- git remote add heroku https://heroku:$HEROKU_STAGING_API_KEY@git.heroku.com/wasa2il-staging.git
- git push -f heroku HEAD:master

development:
stage: deploy
only:
- development
script:
- git remote add heroku https://heroku:$HEROKU_STAGING_API_KEY@git.heroku.com/wasa2il-development.git
- git push -f heroku HEAD:master

release-image:
stage: release
only:
- tags
script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- docker build -t $CONTAINER_RELEASE_IMAGE .
- docker push $CONTAINER_RELEASE_IMAGE
33 changes: 33 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
language: python
python:
- '3.7'
env:
global:
- W2_DATABASE_HOST=127.0.0.1
- W2_DATABASE_PASSWORD=
- W2_DATABASE_USER=root
- W2_SECRET_KEY=`head /dev/urandom | sha256sum`
before_install:
- printenv W2_DATABASE_HOST
- printenv W2_DATABASE_PASSWORD
- printenv W2_DATABASE_USER
- cat /etc/os-release
install: pip install -r requirements.txt && pip install -r requirements-mysql.txt
script:
- coverage run --source=. manage.py test -v 2
- coverage xml
- if [ "$CODACY_PROJECT_TOKEN" ]; then python-codacy-coverage -r coverage.xml; fi
services:
- mysql
deploy:
provider: heroku
api_key:
secure: LRuBdelPHheZTzy275pa2Bhn/gYg5C91rIOAQz26yVyfIfU5aaMbNjROK2m2EpPN+yuMCtVQk/NkQqj4xNUdnqSXBwkmrt1NUbCSL5PJREqNlzqDJYRg445IP47OCWGOIZR5TxGaKNQFSgF7S8Z0dKuG9cipVtvTXqQBf3kFp4s=
app:
development: wasa2il-development
master: wasa2il-staging
run:
- python manage.py migrate
- python manage.py compilemessages
after_success:
- "./tag.sh"
Loading