Merge pull request #67 from coredump-ch/updates

Updates

Author: dbrgn

.github/dependabot.yml

@@ -0,0 +1,19 @@
+version: 2
+updates:
+
+  # Create PRs for Dockerfile updates
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Create PRs for GitHub Actions updates
+  # src: https://github.com/marketplace/actions/build-and-push-docker-images#keep-up-to-date-with-github-dependabot
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Note: Python dependencies are not handled here. For the Python
+  # dependencies, we want Dependabot only for security updates, which is
+  # already enabled through GitHub repository settings.

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       DATABASE_URL: 'postgres://pg:passw0rd@localhost/interna'
     services:
       postgres:
-        image: postgres:13.2-alpine
+        image: postgres:14-alpine
         env:
           POSTGRES_USER: pg
           POSTGRES_PASSWORD: passw0rd
@@ -36,7 +36,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

Dockerfile

@@ -13,7 +13,7 @@
 #
 # See docker-compose.yml as an example on how to run this image.
 
-FROM docker.io/python:3.9-slim-bullseye
+FROM docker.io/python:3.11-slim-bullseye
 
 # Add requirements file
 ADD requirements.txt /code/requirements.txt

README.md

@@ -21,12 +21,15 @@ Für die Authentisierung wird ein Session Cookie oder Basic Auth akzeptiert.
 Voraussetzungen:
 
 - Python 3
-- Pip
-- PostgreSQL
+- Docker
 
-Datenbank:
+Container mit PostgreSQL starten:
 
-    createdb interna
+    docker run -d --name interna-pg \
+      -e POSTGRES_DB=interna \
+      -e POSTGRES_USER=interna \
+      -e POSTGRES_PASSWORD=interna-dev-password \
+      -p 127.0.0.1:5432:5432 docker.io/postgres:14-alpine
 
 [Virtualenv](https://docs.python.org/3/library/venv.html) erstellen:
 
@@ -45,7 +48,7 @@ Umgebungsvariablen definieren (`.env` Datei wird automatisch geladen):
 
     echo "DJANGO_DEBUG=True" >> .env
     echo "SITE_DOMAIN='http://localhost:8000'" >> .env
-    echo "DATABASE_URL='postgres://localhost/interna'" >> .env
+    echo "DATABASE_URL='postgres://interna:interna-dev-password@localhost/interna'" >> .env
 
 Datenbank migrieren:
 

interna/config/settings.py

@@ -35,9 +35,14 @@ def require_env(name):
 MANAGERS = ADMINS
 
 DATABASES = {
-    'default': dj_database_url.config(),
+    'default': dj_database_url.config(
+        conn_max_age=600,
+        conn_health_checks=True,
+    ),
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 if DEBUG:
@@ -61,10 +66,6 @@ def require_env(name):
 # to load the internationalization machinery.
 USE_I18N = True
 
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
@@ -138,8 +139,6 @@ def require_env(name):
     'django.contrib.staticfiles',
 
     'messagegroups',
-    'django_extensions',
-    'bootstrapform',
     'rest_framework',
     'sorl.thumbnail',
     'crispy_forms',
@@ -211,6 +210,8 @@ def require_env(name):
     }
 }
 
+FORM_RENDERER = 'django.forms.renderers.DjangoDivFormRenderer'
+
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.SessionAuthentication',

interna/config/tests/test_robots.py

@@ -1,4 +1,3 @@
-from django.http import HttpResponse
 from django.test import Client
 
 

interna/crowdfund/migrations/0001_initial.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-20 21:42
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0002_auto_20170820_2350.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-20 21:50
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0003_auto_20170821_0002.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-20 22:02
-from __future__ import unicode_literals
-
 from django.db import migrations
 import sorl.thumbnail.fields
 

interna/crowdfund/migrations/0004_project_initiator.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-20 22:36
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

interna/crowdfund/migrations/0005_fundingpromise.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-27 21:19
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

interna/crowdfund/migrations/0006_auto_20170828_0052.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-27 22:52
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0007_auto_20170828_0108.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-27 23:08
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0008_auto_20170906_2346.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-06 21:46
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import sorl.thumbnail.fields
 

interna/crowdfund/migrations/0009_project_funded.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-10 20:05
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0010_auto_20170910_2308.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-10 21:08
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/migrations/0011_project_forum_thread.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-10 21:17
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

interna/crowdfund/tests/test_models.py

@@ -3,7 +3,7 @@
 from django.core import mail
 
 from freezegun import freeze_time
-from model_mommy import mommy
+from model_bakery import baker
 import pytest
 import pytz
 
@@ -13,7 +13,7 @@
 @pytest.mark.django_db
 def test_empty_project():
     with freeze_time('2017-01-01'):
-        p = mommy.make(Project, image=None, amount_required=500)
+        p = baker.make(Project, image=None, amount_required=500)
     assert p.amount_funded() == 0
     assert p.percent_funded() == 0
     assert len(p.active_promises()) == 0
@@ -24,11 +24,11 @@ def test_empty_project():
 
 @pytest.mark.django_db
 def test_regular_project():
-    p1 = mommy.make(Project, image=None, amount_required=500)
-    p2 = mommy.make(Project, image=None, amount_required=800)
-    mommy.make(FundingPromise, project=p1, amount=100, expiry_date=None)
-    mommy.make(FundingPromise, project=p1, amount=200, expiry_date=None)
-    mommy.make(FundingPromise, project=p2, amount=400, expiry_date=None)
+    p1 = baker.make(Project, image=None, amount_required=500)
+    p2 = baker.make(Project, image=None, amount_required=800)
+    baker.make(FundingPromise, project=p1, amount=100, expiry_date=None)
+    baker.make(FundingPromise, project=p1, amount=200, expiry_date=None)
+    baker.make(FundingPromise, project=p2, amount=400, expiry_date=None)
     assert p1.amount_funded() == 300
     assert p2.amount_funded() == 400
     assert p1.percent_funded() == 60
@@ -44,23 +44,23 @@ def test_regular_project():
 @pytest.mark.django_db
 def test_funded_freeze():
     with freeze_time('2017-01-01'):
-        p1 = mommy.make(Project, image=None, amount_required=120)
+        p1 = baker.make(Project, image=None, amount_required=120)
         assert p1.amount_funded() == 0
         assert p1.percent_funded() == 0
         assert p1.funded is None
         assert len(p1.active_promises()) == len(p1.expired_promises()) == 0
 
     # First promise without expiration
     with freeze_time('2017-01-02'):
-        mommy.make(FundingPromise, project=p1, amount=80, expiry_date=None)
+        baker.make(FundingPromise, project=p1, amount=80, expiry_date=None)
         assert p1.amount_funded() == 80
         assert p1.percent_funded() == 66
         assert len(p1.active_promises()) == 1
         assert len(p1.expired_promises()) == 0
 
     # Second promise with expiration, not enough to trigger funding
     with freeze_time('2017-01-03'):
-        mommy.make(FundingPromise, project=p1, amount=30,
+        baker.make(FundingPromise, project=p1, amount=30,
                 expiry_date=datetime(2017, 1, 4, tzinfo=pytz.utc))
         assert p1.amount_funded() == 110
         assert p1.percent_funded() == 91
@@ -73,7 +73,7 @@ def test_funded_freeze():
 
     # Create a new expiring promise that reaches the funding goal
     with freeze_time('2017-01-05'):
-        mommy.make(FundingPromise, project=p1, amount=50,
+        baker.make(FundingPromise, project=p1, amount=50,
                 expiry_date=datetime(2017, 1, 7, tzinfo=pytz.utc))
         assert p1.amount_funded() == 130
         assert p1.funded == datetime(2017, 1, 5, tzinfo=pytz.utc)
@@ -85,7 +85,7 @@ def test_funded_freeze():
 
     # We can also add further promises
     with freeze_time('2017-01-07'):
-        mommy.make(FundingPromise, project=p1, amount=10,
+        baker.make(FundingPromise, project=p1, amount=10,
                 expiry_date=datetime(2017, 1, 8, tzinfo=pytz.utc))
         assert p1.amount_funded() == 140
 
@@ -100,16 +100,16 @@ def test_funded_freeze():
 
 @pytest.mark.django_db
 def test_funding_emails():
-    p = mommy.make(Project, image=None, amount_required=120,
+    p = baker.make(Project, image=None, amount_required=120,
             initiator__email='foo@bar.baz', title='Yolo')
     assert len(mail.outbox) == 0
-    mommy.make(FundingPromise, project=p, amount=80, expiry_date=None)
+    baker.make(FundingPromise, project=p, amount=80, expiry_date=None)
     assert len(mail.outbox) == 1
     assert mail.outbox[0].subject == '80 CHF für dein Projekt "Yolo"!'
-    mommy.make(FundingPromise, project=p, amount=20, expiry_date=None)
+    baker.make(FundingPromise, project=p, amount=20, expiry_date=None)
     assert len(mail.outbox) == 2
     assert mail.outbox[1].subject == '20 CHF für dein Projekt "Yolo"!'
-    mommy.make(FundingPromise, project=p, amount=30, expiry_date=None)
+    baker.make(FundingPromise, project=p, amount=30, expiry_date=None)
     assert len(mail.outbox) == 4
     assert mail.outbox[2].subject == '30 CHF für dein Projekt "Yolo"!'
     assert mail.outbox[3].subject == 'Dein Projekt "Yolo" wurde finanziert!'

interna/crowdfund/tests/test_views.py

@@ -4,7 +4,7 @@
 
 import re
 import pytest
-from model_mommy import mommy
+from model_bakery import baker
 
 from crowdfund import models
 
@@ -38,10 +38,10 @@ def test_status_codes(client, method, url, pk, user, status_code):
     get_user_model().objects.create_user(pk=2, username='user2', password='1235')
 
     # PK 1: Ongoing project by user 1
-    mommy.make(models.Project, pk=1, image=None, initiator=u1, funded=None)
+    baker.make(models.Project, pk=1, image=None, initiator=u1, funded=None)
 
     # PK 2: Funded project by user 1
-    mommy.make(models.Project, pk=2, image=None, initiator=u1, funded=timezone.now())
+    baker.make(models.Project, pk=2, image=None, initiator=u1, funded=timezone.now())
 
     # Login
     if user == 1:
@@ -57,7 +57,7 @@ def test_status_codes(client, method, url, pk, user, status_code):
 
 @pytest.mark.django_db
 def test_pledge_name_and_email(client):
-    prj = mommy.make(models.Project)
+    prj = baker.make(models.Project)
     path = '/crowdfund/projects/{}/'.format(prj.pk)
     response = client.get(path)
     assert response.status_code == 200

interna/front/mixins.py

@@ -2,7 +2,7 @@
 from django.utils.decorators import method_decorator
 
 
-class LoginRequiredMixin(object):
+class LoginRequiredMixin:
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):

interna/front/static/css/style.css

@@ -3,6 +3,18 @@ iframe.fullwidth {
     height: 700px;
 }
 
+form ul.errorlist {
+    color: #d30000;
+}
+
+body.login form div {
+    margin: 0 0 8px;
+}
+
+body.login form label {
+    width: 130px;
+}
+
 body.members table {
     font-size: 0.85em;
 }

interna/front/templates/front/login.html

@@ -1,5 +1,5 @@
 {% extends 'front/base.html' %}
-{% load tabs bootstrap %}
+{% load tabs crispy_forms_tags %}
 
 {% block bodyclass %}login{% endblock %}
 
@@ -16,7 +16,7 @@ <h1>Login</h1>
 
     <form role="form" action="{% url 'front:login' %}" method="post">
         {% csrf_token %}
-        {{ form|bootstrap }}
+        {{ form }}
         <button type="submit" class="btn btn-primary">Login</button>
         <input type="hidden" name="next" value="{{ next }}" />
     </form>