Merge branch 'CI' into 'master'

CI

Closes #61

See merge request kif/akplanning!37

.gitlab-ci.yml

+image: python:latest
+
+services:
+  - mysql:5.7
+
+variables:
+  MYSQL_DATABASE: "test"
+  MYSQL_ROOT_PASSWORD: "mysql"
+  MYSQL_USER: "django"
+  MYSQL_PASSWORD: "mysql"
+  MYSQL_HOST: "mysql"
+
+cache:
+  paths:
+    - ~/.cache/pip/
+
+before_script:
+  - python -V  # Print out python version for debugging
+  - apt-get -qq update
+  - apt-get -qq install -y python-virtualenv python3 python3-dev python3-pip gettext default-libmysqlclient-dev
+  - export DJANGO_SETTINGS_MODULE=AKPlanning.settings_ci
+  - ./Utils/setup.sh --prod
+
+test:
+  script:
+    - source venv/bin/activate
+    - python manage.py test --settings AKPlanning.settings_ci

AKModel/migrations/0017_owner_slug.py

@@ -33,9 +33,8 @@ class Migration(migrations.Migration):
             migrate_data_forward,
             migrations.RunPython.noop,
         ),
-        migrations.AlterField(
-            model_name='akowner',
-            name='slug',
-            field=models.SlugField(blank=True, help_text='Slug for URL generation', unique=True, max_length=64, verbose_name='Slug')
+        migrations.AlterUniqueTogether(
+            name='akowner',
+            unique_together={('event', 'name', 'institution'), ('event', 'slug')},
         )
     ]

AKModel/migrations/0028_unique_constraints.py

@@ -38,10 +38,6 @@ class Migration(migrations.Migration):
             name='akcategory',
             unique_together={('event', 'name')},
         ),
-        migrations.AlterUniqueTogether(
-            name='akowner',
-            unique_together={('event', 'name', 'institution'), ('event', 'slug')},
-        ),
         migrations.AlterUniqueTogether(
             name='akrequirement',
             unique_together={('event', 'name')},

AKPlanning/settings_ci.py

+# noinspection PyUnresolvedReferences
+from AKPlanning.settings import *
+
+DEBUG = False
+SECRET_KEY = '+7#&=$grg7^x62m#3cuv)k$)tqx!xkj_o&y9sm)@@sgj7_7-!+'
+
+SESSION_COOKIE_SECURE = True
+CSRF_COOKIE_SECURE = True
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'HOST': 'mysql',
+        'NAME': 'test',
+        'USER': 'django',
+        'PASSWORD': 'mysql',
+        'OPTIONS': {
+            'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+        }
+    }
+}

Utils/setup.sh

@@ -20,7 +20,7 @@ python manage.py migrate
 
 # Prepare static files and translations
 python manage.py collectstatic --noinput
-python manage.py compilemessages
+python manage.py compilemessages -l de_DE
 
 # Create superuser
 # Credentials are entered interactively on CLI

requirements.txt

@@ -6,3 +6,4 @@ django-timezone-field==4.0
 djangorestframework==3.11.0
 django-simple-history==2.10.0
 django-registration-redux==2.8
+mysqlclient==1.4.6  # for production deployment