From 6fde5587889e16c777d443c904347a0dbc4e6644 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Thu, 20 Dec 2018 07:29:45 +0100
Subject: [PATCH] Upgrade upstream to 3.x

Should fix the failing level2 of yunohost-apps CI also (infinite redirection
bug fixed upstream).

Fix #30
Ref https://github.com/YunoHost/apps/pull/553#issuecomment-448883502
---
 manifest.json      | 2 +-
 scripts/_common.sh | 4 ----
 scripts/install    | 2 +-
 scripts/upgrade    | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 088d87f..7f8fbad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,7 @@
         "fr": "Une application web de comptes partagés à plusieurs"
     },
     "url": "http://ihatemoney.org/",
-    "version": "2.1~ynh1",
+    "version": "3.0~ynh1",
     "license": "free",
     "maintainer": {
         "name": "Jocelyn Delalande",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3ceba0f..d9eceb2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -35,10 +35,6 @@ create_system_dirs() {
 init_virtualenv () {
     sudo virtualenv /opt/yunohost/ihatemoney/venv --python /usr/bin/python3
 
-    # Will no longer be necessary for ihm>=3.x
-    # https://github.com/spiral-project/ihatemoney/blob/master/CHANGELOG.rst#fixed
-    sudo /opt/yunohost/ihatemoney/venv/bin/pip install 'pip<10'
-
     # PyMySQL → cryptography → setuptools>=18.5
     # Required on Jessie, Stretch has setuptools>=18.5
     /opt/yunohost/ihatemoney/venv/bin/pip install 'setuptools>=18.5'
diff --git a/scripts/install b/scripts/install
index da3eb9e..c7ab888 100755
--- a/scripts/install
+++ b/scripts/install
@@ -46,7 +46,7 @@ init_virtualenv
 sudo /opt/yunohost/ihatemoney/venv/bin/pip install \
      'gunicorn>=19.3.0' \
      'PyMySQL>=0.9,<0.10' \
-     'ihatemoney>=2,<3' \
+     'ihatemoney>=3,<4' \
 
 create_system_dirs
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 923e9ba..16c9dcf 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,7 +85,7 @@ fi
 
 
 # Upgrade code and dependencies
-sudo ${PIP} install --upgrade  'gunicorn>=19.3.0' PyMySQL 'ihatemoney>=2,<3'
+sudo ${PIP} install --upgrade  'gunicorn>=19.3.0' PyMySQL 'ihatemoney>=3,<4'
 
 
 #-----------------------POST-UPGRADE MIGRATIONS-----------------