From ecf64677991ace56b29bd1002b47b7476b704ce3 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 22 Jan 2019 17:41:56 +0530 Subject: [PATCH 1/3] fix(travis): Redis must be working for caching, so reverting (#16455) --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e21d59511a..9e63c0e6b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,16 +30,16 @@ before_script: - cd ~/frappe-bench - bench get-app erpnext $TRAVIS_BUILD_DIR - bench use test_site + - bench reinstall --yes + - bench scheduler disable + - sed -i 's/9000/9001/g' sites/common_site_config.json + - bench start & + - sleep 10 jobs: include: - stage: test script: - - bench reinstall --yes - - bench scheduler disable - - sed -i 's/9000/9001/g' sites/common_site_config.json - - bench start & - - sleep 10 - set -e - bench run-tests env: Server Side Test From 2a9a867f053624fc35032dfd0d45196c155f4a59 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 22 Jan 2019 18:35:44 +0550 Subject: [PATCH 2/3] bumped to version 10.1.79 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index db9ca3309e..ff8ca74790 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.78' +__version__ = '10.1.79' def get_default_company(user=None): '''Get default company for user''' From 5555b2802f6d3e91f03cce562c9457604528c0d7 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 22 Jan 2019 18:37:09 +0550 Subject: [PATCH 3/3] bumped to version 11.0.3-beta.36 --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index bbadd7f150..cd352de394 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '12.x.x-develop' -staging_version = '11.0.3-beta.35' +staging_version = '11.0.3-beta.36' error_report_email = "support@erpnext.com"