From a5fa29f256170415239db5b79a3007f444979316 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 10:24:40 +0530 Subject: [PATCH 1/5] chore: pin python dependencies --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index a6cfaf2ce4f..e589206aff5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ frappe -unidecode -pygithub -googlemaps +Unidecode==1.1.1 +PyGithub==1.43.8 +googlemaps==3.0.2 From 999216e727909c79b288e3626d4985ee997162c1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 15:04:09 +0530 Subject: [PATCH 2/5] fix: update easy install script usage --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e63c0e6b04..13542c2ce60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ install: - sudo apt-get purge -y mysql-common mysql-server mysql-client - nvm install v7.10.0 - 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 + - sudo python3 install.py --develop --user travis --without-bench-setup + - sudo python3 -m pip install -e ~/bench - rm $TRAVIS_BUILD_DIR/.git/shallow - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh From ac4a3057cf7313a0ca8b340aa36a537117aff997 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 17:40:25 +0530 Subject: [PATCH 3/5] fix: travis add pip3 addon --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 13542c2ce60..6f106b2c196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,13 @@ language: python + dist: trusty +addons: + apt: + packages: + - "python3" + - "python3-pip" + python: - "2.7" From f876f4c2b272df0d1e6621aff965c576e937c7b3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 17:50:33 +0530 Subject: [PATCH 4/5] chore: allow sudo in travis runs --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6f106b2c196..e5217a4aaae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: python dist: trusty +sudo: true + addons: apt: packages: From 1183d3e1bc5f78f42d06fa87e3ae390a03ff0941 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 9 Apr 2020 20:22:20 +0530 Subject: [PATCH 5/5] chore(travis): update and install setuptools and pip --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5217a4aaae..4dd12658afa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python -dist: trusty - -sudo: true +dist: xenial addons: apt: @@ -18,8 +16,7 @@ services: install: - pip install flake8==3.3.0 - - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - - sudo rm /etc/apt/sources.list.d/docker.list + - sudo -H python3 -m pip install --upgrade setuptools pip - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/ - sudo apt-get purge -y mysql-common mysql-server mysql-client - nvm install v7.10.0