From 026c1ec4aaa7ea758b16f01f4842630228c38907 Mon Sep 17 00:00:00 2001 From: Jocelyn Delalande Date: Mon, 16 Jul 2018 23:00:31 +0200 Subject: [PATCH 1/3] Add missing ChangeLog entry --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 663a861b..499f0e60 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,7 +6,11 @@ This document describes changes between each past release. 2.1.1 (unreleased) ------------------ +Fixed +===== + - Regenerate translations (#338) +- Fix broken install with pip ≥ 10 (#340) 2.1 (2018-02-16) From 9caf213e1d4f2f92944000f2c072fcece885f407 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Tue, 17 Jul 2018 00:22:23 +0200 Subject: [PATCH 2/3] Document MySQL setup (#357) PyMySQL is more difficult to install since its version 0.9 since it now depends on *cryptography* lib, which in turns depends on OpenSSL and Python dev files. See https://github.com/PyMySQL/PyMySQL/issues/697 --- CHANGELOG.rst | 5 +++++ docs/installation.rst | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 499f0e60..15df733a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,11 @@ Fixed - Regenerate translations (#338) - Fix broken install with pip ≥ 10 (#340) +Added +===== + +- Document MySQL setup (#357) + 2.1 (2018-02-16) ---------------- diff --git a/docs/installation.rst b/docs/installation.rst index e7d586ec..4829c5de 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -63,6 +63,22 @@ Once installed, you can start a test server:: And point your browser at `http://localhost:5000 `_. +Configure database with MySQL/MariaDB (optional) +================================================ + +Only required if you prefer MySQL/MariaDB over SQLite. + +1. Install PyMySQL dependencies. On Debian or Ubuntu, that would be:: + + apt install python3-dev libssl-dev + +2. Install PyMySQL (within your virtualenv):: + + pip install 'PyMySQL>=0.9,<0.10' + +3. Create an empty database and a database user +4. Configure :ref:`SQLALCHEMY_DATABASE_URI ` accordingly + Deploy it ========= @@ -159,6 +175,8 @@ For example, use the following command to add more gunicorn workers:: docker run -d -p 8000:8000 ihatemoney -w 3 +.. _configuration: + Configuration ============= @@ -187,7 +205,7 @@ Production values are recommended values for use in production. | | | **Production value:** `ihatemoney conf-example ihatemoney.cfg` sets it to something | | | | random, which is good. | +-------------------------------+---------------------------------+----------------------------------------------------------------------------------------+ -| MAIL_DEFAULT_SENDER | ``("Budget manager", | A python tuple describing the name and email address to use when sending | +| MAIL_DEFAULT_SENDER | ``("Budget manager", | A python tuple describing the name and email address to use when sending | | | "budget@notmyidea.org")`` | emails. | | | | | | | | **Production value:** Any tuple you want. | From 94e2befb8290053e1159925e782a17a2dfb19e20 Mon Sep 17 00:00:00 2001 From: Carey Metcalfe Date: Fri, 3 Aug 2018 11:11:12 -0400 Subject: [PATCH 3/3] Fix cffi installation in Dockerfile (#364) The Python cffi package requires the libc, libffi and openssl development packages, as well as gcc to compile it. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fbc0f4ac..cbe4af6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM python:3.6-alpine -RUN mkdir /ihatemoney &&\ +RUN apk add gcc libc-dev libffi-dev openssl-dev &&\ + mkdir /ihatemoney &&\ mkdir -p /etc/ihatemoney &&\ pip install --no-cache-dir gunicorn pymysql