From 3ee048e40bf8729de7541de3450e19990840b0f0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jan 2018 14:57:20 +0530 Subject: [PATCH 1/5] Removed ui-tests from travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccbcec240a..cbf98da4d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,5 +55,3 @@ before_script: script: - set -e - bench run-tests - - sleep 5 - - bench run-ui-tests --app frappe From ae950bfff47bdb93595a318fe3568dde6839cdc1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jan 2018 15:02:50 +0530 Subject: [PATCH 2/5] Removed ui-tests from travis --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbf98da4d5..df72ef310a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,15 +30,6 @@ install: - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/ before_script: - - wget http://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip - - unzip chromedriver_linux64.zip - - sudo apt-get install libnss3 - - sudo apt-get --only-upgrade install google-chrome-stable - - sudo cp chromedriver /usr/local/bin/. - - sudo chmod +x /usr/local/bin/chromedriver - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - sleep 3 - 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 19e41261751f5d9d9b1be95e9d96e9cc321336f4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jan 2018 15:10:31 +0530 Subject: [PATCH 3/5] Removed ui-tests from travis --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index df72ef310a..dc89895bab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,6 @@ language: python dist: trusty -addons: - apt: - sources: - - google-chrome - packages: - - google-chrome-stable - python: - "2.7" From c328c27f858940beaabd95cd69f1abec3f4de9d6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jan 2018 15:35:25 +0530 Subject: [PATCH 4/5] minor fix --- frappe/core/doctype/file/file.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 1c6a0edceb..d5e76fca01 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -19,7 +19,7 @@ import mimetypes, imghdr from frappe.utils.file_manager import delete_file_data_content, get_content_hash, get_random_filename from frappe import _ from frappe.utils.nestedset import NestedSet -from frappe.utils import strip, get_files_path +from frappe.utils import strip, get_files_path, flt from PIL import Image, ImageOps from six import StringIO, string_types from six.moves.urllib.parse import unquote @@ -120,8 +120,8 @@ class File(NestedSet): """Returns folder size for current folder""" if not folder: folder = self.name - file_size = frappe.db.sql("""select sum(ifnull(file_size,0)) - from tabFile where folder=%s """, (folder))[0][0] + file_size = flt(frappe.db.sql("""select sum(ifnull(file_size,0)) + from tabFile where folder=%s """, (folder))[0][0]) return file_size From 5fba05d3f3205da004723438ab83c80eb47e01f3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jan 2018 18:47:20 +0600 Subject: [PATCH 5/5] bumped to version 10.0.17 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 6b780b7882..83ec87e92d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '10.0.16' +__version__ = '10.0.17' __title__ = "Frappe Framework" local = Local()