diff options
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | api/admin.py | 2 | ||||
| -rw-r--r-- | home/admin.py | 2 | ||||
| -rw-r--r-- | home/models.py | 2 | ||||
| -rw-r--r-- | home/views.py | 2 | ||||
| -rw-r--r-- | pysite/hosts.py | 8 | ||||
| -rw-r--r-- | pysite/settings.py | 2 | ||||
| -rw-r--r-- | wiki/admin.py | 2 | ||||
| -rw-r--r-- | wiki/models.py | 2 | ||||
| -rw-r--r-- | wiki/tests.py | 2 | ||||
| -rw-r--r-- | wiki/views.py | 2 |
12 files changed, 36 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe86b32c..c8bcb91e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,11 @@ +stages: + - build + - lint + - test + build base image: image: docker:stable-git + stage: build script: - sh scripts/deploy-ci.sh tags: @@ -10,7 +16,21 @@ build base image: - django+add-gitlab-ci lint: - image: pythondiscord/django-site-ci:latest + image: registry.gitlab.com/python-discord/projects/site/django-base:latest + stage: lint script: - - pipenv install --system --dev + - pipenv install --dev --system - flake8 + +test: + image: registry.gitlab.com/python-discord/projects/site/django-base:latest + stage: test + services: + - postgres:10-alpine + script: + - pipenv run manage.py test + variables: + DATABASE_URL: postgres://django:supersecret@postgres/pysite + POSTGRES_DB: pysite + POSTGRES_PASSWORD: supersecret + POSTGRES_USER: django @@ -1 +1 @@ -FROM pythondiscord/django-site-ci:latest +FROM registry.gitlab.com/python-discord/projects/site/django-base:latest diff --git a/api/admin.py b/api/admin.py index 8c38f3f3..4185d360 100644 --- a/api/admin.py +++ b/api/admin.py @@ -1,3 +1,3 @@ -from django.contrib import admin +# from django.contrib import admin # Register your models here. diff --git a/home/admin.py b/home/admin.py index 8c38f3f3..4185d360 100644 --- a/home/admin.py +++ b/home/admin.py @@ -1,3 +1,3 @@ -from django.contrib import admin +# from django.contrib import admin # Register your models here. diff --git a/home/models.py b/home/models.py index 71a83623..0b4331b3 100644 --- a/home/models.py +++ b/home/models.py @@ -1,3 +1,3 @@ -from django.db import models +# from django.db import models # Create your models here. diff --git a/home/views.py b/home/views.py index 91ea44a2..fd0e0449 100644 --- a/home/views.py +++ b/home/views.py @@ -1,3 +1,3 @@ -from django.shortcuts import render +# from django.shortcuts import render # Create your views here. diff --git a/pysite/hosts.py b/pysite/hosts.py index 827f49c3..67fc2451 100644 --- a/pysite/hosts.py +++ b/pysite/hosts.py @@ -4,10 +4,10 @@ from django_hosts import host, patterns host_patterns = patterns( '', # > | Subdomain | URL Module | Host entry name | - #host(r"admin", "admin", name="admin"), + # host(r"admin", "admin", name="admin"), host(r'api', 'api.urls', name='api'), - #host(r"staff", "staff", name="staff"), - #host(r"wiki", "wiki", name="wiki"), - #host(r"ws", "ws", name="ws"), + # host(r"staff", "staff", name="staff"), + # host(r"wiki", "wiki", name="wiki"), + # host(r"ws", "ws", name="ws"), host(r'.*', 'home.urls', name=settings.DEFAULT_HOST) ) diff --git a/pysite/settings.py b/pysite/settings.py index 3392426d..16235e09 100644 --- a/pysite/settings.py +++ b/pysite/settings.py @@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/2.1/ref/settings/ """ import os -import sys +# import sys import environ diff --git a/wiki/admin.py b/wiki/admin.py index 8c38f3f3..4185d360 100644 --- a/wiki/admin.py +++ b/wiki/admin.py @@ -1,3 +1,3 @@ -from django.contrib import admin +# from django.contrib import admin # Register your models here. diff --git a/wiki/models.py b/wiki/models.py index 71a83623..0b4331b3 100644 --- a/wiki/models.py +++ b/wiki/models.py @@ -1,3 +1,3 @@ -from django.db import models +# from django.db import models # Create your models here. diff --git a/wiki/tests.py b/wiki/tests.py index 7ce503c2..a79ca8be 100644 --- a/wiki/tests.py +++ b/wiki/tests.py @@ -1,3 +1,3 @@ -from django.test import TestCase +# from django.test import TestCase # Create your tests here. diff --git a/wiki/views.py b/wiki/views.py index 91ea44a2..fd0e0449 100644 --- a/wiki/views.py +++ b/wiki/views.py @@ -1,3 +1,3 @@ -from django.shortcuts import render +# from django.shortcuts import render # Create your views here. |