From 8d329eb71691e5e1a9969cdd56118678a424a2a9 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 20 Jun 2016 14:45:38 +0200 Subject: [PATCH] Fix migrations and create a developer script that sets necessary minimal env --- .gitignore | 1 + README.md | 3 +- dev.sh | 36 ++++++++++++++++++++++ shop/migrations/0016_auto_20160529_1122.py | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100755 dev.sh diff --git a/.gitignore b/.gitignore index f6170ce7..eb2b9aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.dev .idea/ __pycache__/ db.sqlite3 diff --git a/README.md b/README.md index e81afc2e..7b218af5 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ Features do not include: ## Quickstart - -Create a virtual environment and activate it: +Create a Python 2.7 virtual environment and activate it: $ virtualenv venv $ source venv/bin/activate diff --git a/dev.sh b/dev.sh new file mode 100755 index 00000000..67fe103a --- /dev/null +++ b/dev.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# Directory of this script +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +DEV_DIR="$DIR/.dev" + +if [ ! -d "$DEV_DIR"] +then + mkdir -p "$DEV_DIR" +fi + +export MEDIA_ROOT="$DEV_DIR/media/" +export EPAY_MERCHANT_NUMBER="123" +export EPAY_MD5_SECRET="123" +export COINIFY_API_KEY="123" +export COINIFY_API_SECRET="123" +export COINIFY_IPN_SECRET="123" +export PDF_LETTERHEAD_FILENAME="bornhax.pdf" +export BANKACCOUNT_IBAN="femfladeflødeboller" +export BANKACCOUNT_SWIFTBIC="goldmansachs" +export BANKACCOUNT_REG="1234" +export BANKACCOUNT_ACCOUNT="56789" +export TICKET_CATEGORY_ID="1" +export SECRET_KEY="muchsecret" +export ALLOWED_HOSTS="127.0.0.1" +export DATABASE_URL="sqlite:///$DEV_DIR/dev.db" +export EMAIL_HOST="localhost" +export EMAIL_PORT="22" +export EMAIL_HOST_USER="$USER" +export EMAIL_HOST_PASSWORD="" +export EMAIL_USE_TLS="" +export DEFAULT_FROM_EMAIL="bornhax@localhost" +export ARCHIVE_EMAIL="" + +python manage.py $@ diff --git a/shop/migrations/0016_auto_20160529_1122.py b/shop/migrations/0016_auto_20160529_1122.py index a77054ec..90d0efdb 100644 --- a/shop/migrations/0016_auto_20160529_1122.py +++ b/shop/migrations/0016_auto_20160529_1122.py @@ -16,7 +16,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='coinifycallback', name='headers', - field=django.contrib.postgres.fields.jsonb.JSONField(default=''), + field=django.contrib.postgres.fields.jsonb.JSONField(default=None), preserve_default=False, ), migrations.AddField(