From 3fa112d8a7338d30112be476ea18b6734bc4c0eb Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 11:16:25 +0530 Subject: [PATCH 1/8] feat(travis): Python 3.6 tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 869fe959c00..f2ba2c43261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ dist: trusty python: - "2.7" + - "3.6" services: - mysql From f397acc9362d7820798dae4286c8e839fa16f0f8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 11:31:08 +0530 Subject: [PATCH 2/8] fix(travis): Refactor .travis.yml --- .travis.yml | 24 +++++++++--------------- travis/run-tests.sh | 12 ++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 travis/run-tests.sh diff --git a/.travis.yml b/.travis.yml index f2ba2c43261..26a4caa0fbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,10 @@ python: - "2.7" - "3.6" +env: + - TEST_TYPE=Server Side Test + - TEST_TYPE=Patch Test + services: - mysql @@ -40,18 +44,8 @@ before_script: - bench start & - sleep 10 -jobs: - include: - - stage: test - script: - - set -e - - bench run-tests --app erpnext --coverage - after_script: - - coveralls -b apps/erpnext -d ../../sites/.coverage - env: Server Side Test - - # stage - script: - - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz - - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis - - bench migrate - env: Patch Testing +script: + - $TRAVIS_BUILD_DIR/travis/run-tests.sh + +after_script: + - coveralls -b apps/erpnext -d ../../sites/.coverage diff --git a/travis/run-tests.sh b/travis/run-tests.sh new file mode 100644 index 00000000000..7cfd64833b7 --- /dev/null +++ b/travis/run-tests.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +if [[ $TEST_TYPE == 'Server Side Test' ]]; then + bench run-tests --app erpnext --coverage + +elif [[ $TEST_TYPE == 'Patch Test' ]]; then + wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz + bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis + bench migrate +fi From 63ddff867a0ad62648488ea99f7f1027abb965ec Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 12:06:24 +0530 Subject: [PATCH 3/8] chore: Temporarily disable flake rule F821 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26a4caa0fbe..2e3a1e7782a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: # fix mongodb travis error - sudo rm /etc/apt/sources.list.d/mongodb*.list - pip install flake8==3.3.0 - - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics + - flake8 . --count --select=E901,E999,F822,F823 --show-source --statistics - sudo rm /etc/apt/sources.list.d/docker.list - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/ - sudo apt-get purge -y mysql-common mysql-server mysql-client From bb5ca5a01fe89fcb36a73306c2dedabcee2bf334 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 17:35:37 +0530 Subject: [PATCH 4/8] fix(py3): Convert filter to list --- erpnext/accounts/doctype/pricing_rule/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py index 8a8e3291aa8..5795b8f808f 100644 --- a/erpnext/accounts/doctype/pricing_rule/utils.py +++ b/erpnext/accounts/doctype/pricing_rule/utils.py @@ -232,7 +232,7 @@ def filter_pricing_rules(args, pricing_rules, doc=None): if len(pricing_rules) > 1: rate_or_discount = list(set([d.rate_or_discount for d in pricing_rules])) if len(rate_or_discount) == 1 and rate_or_discount[0] == "Discount Percentage": - pricing_rules = filter(lambda x: x.for_price_list==args.price_list, pricing_rules) \ + pricing_rules = list(filter(lambda x: x.for_price_list==args.price_list, pricing_rules)) \ or pricing_rules if len(pricing_rules) > 1 and not args.for_shopping_cart: From c052ce61f77a1660bc9322877f05ecdfd3632841 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 17:41:36 +0530 Subject: [PATCH 5/8] fix: Set file permissions 755 on travis/run-tests.sh --- travis/run-tests.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 travis/run-tests.sh diff --git a/travis/run-tests.sh b/travis/run-tests.sh old mode 100644 new mode 100755 From 44da737c1bdc50ecf623957bae2c2dda7185052a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 18:08:44 +0530 Subject: [PATCH 6/8] fix: Minor --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e3a1e7782a..612a9e416cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ python: - "3.6" env: - - TEST_TYPE=Server Side Test - - TEST_TYPE=Patch Test + - TEST_TYPE="Server Side Test" + - TEST_TYPE="Patch Test" services: - mysql From 700711c28d2206efc939d6172c939b864cd81841 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 1 May 2019 18:25:53 +0530 Subject: [PATCH 7/8] fix: Run script with bash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 612a9e416cb..3ce1439d95c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_script: - sleep 10 script: - - $TRAVIS_BUILD_DIR/travis/run-tests.sh + - bash $TRAVIS_BUILD_DIR/travis/run-tests.sh after_script: - coveralls -b apps/erpnext -d ../../sites/.coverage From 51eecd0c4276631ca267223c3fb84ef4b5a253b1 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 20 Jun 2019 14:07:32 +0530 Subject: [PATCH 8/8] chore: Enable Flake 821 rule --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ce1439d95c..a8a0d826145 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: # fix mongodb travis error - sudo rm /etc/apt/sources.list.d/mongodb*.list - pip install flake8==3.3.0 - - flake8 . --count --select=E901,E999,F822,F823 --show-source --statistics + - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - sudo rm /etc/apt/sources.list.d/docker.list - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/ - sudo apt-get purge -y mysql-common mysql-server mysql-client