From 7dc6a0b52d216bc33a17389297818dd5b4cddcf4 Mon Sep 17 00:00:00 2001 From: shreyas Date: Mon, 1 Aug 2016 17:17:33 +0530 Subject: [PATCH 1/3] [Minor] Replace new installer in travis.yml --- .travis.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4601f0eafb..8e89187db8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +dist: trusty python: - "2.7" @@ -11,9 +12,13 @@ before_install: - "sh -e /etc/init.d/xvfb start" install: - - sudo apt-get purge -y mysql-common - - wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh - - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis --bench-branch develop + - sudo apt-get purge -y mysql-common mysql-server mysql-client + # - wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh + # - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis --bench-branch develop + - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py + - sudo python install.py --develop --user travis --without-bench-setup + - sudo pip install -e ~/bench + - rm $TRAVIS_BUILD_DIR/.git/shallow - cd ~/ && bench init frappe-bench --frappe-path $TRAVIS_BUILD_DIR - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/ @@ -28,7 +33,6 @@ script: - bench --verbose run-tests --driver Firefox before_script: - - mysql -e 'create database test_frappe' + - mysql -u root -ptravis -e 'create database test_frappe' - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis - From dd9131b8ab686437cd8584ba8cdc03ca6025fc22 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Aug 2016 18:02:49 +0530 Subject: [PATCH 2/3] [patch] Set Email Group based on Newsletter list value --- frappe/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches.txt b/frappe/patches.txt index bb38ebae50..5ca449970a 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -135,3 +135,4 @@ execute:frappe.db.sql("delete from `tabWeb Page` where ifnull(template_path, '') frappe.patches.v7_0.re_route #2016-06-27 frappe.patches.v7_0.rename_newsletter_list_to_email_group frappe.patches.v7_0.replace_upgrade_link_limit +execute:frappe.db.sql("update `tabEmail Group Member` set email_group = newsletter_list where email_group is null or email_group = ''") From 9d6c895fa505d919676d352e73cde1ab9d824831 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Aug 2016 18:38:28 +0600 Subject: [PATCH 3/3] bumped to version 7.0.13 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 0ef9a02fe2..d4f30222d3 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.12" +__version__ = "7.0.13" local = Local()