commit d053081cb785596acdb6cd4bc64c20b1a9e3befc
author Gavin D'souza <gavin18d@gmail.com> Fri May 28 21:48:05 2021 +0530
committer Gavin D'souza <gavin18d@gmail.com> Fri May 28 21:48:05 2021 +0530
tree 2acc6a6dc512acd212fdc1df430b1dd1c91ab1e5
parent f93a7a72c1142068e69cfb01367d16b218e945d0
parent 6038663bf82cbfa9e019a6a9020f8ccd92631607

Merge branch 'develop' of github.com:frappe/erpnext into rm-py2

.github/helper/install.sh

diff --git a/.github/helper/install.sh b/.github/helper/install.sh
index 7b0f944..8020408 100644
--- a/.github/helper/install.sh
+++ b/.github/helper/install.sh
@@ -12,7 +12,7 @@
 
 pip install frappe-bench
 
-git clone https://github.com/frappe/frappe --branch "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" --depth 1
+git clone https://github.com/gavindsouza/frappe --branch drop-py2-code --depth 1
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index f1ffeb8..65688f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+future==0.18.2
 # frappe   # https://github.com/frappe/frappe is installed during bench-init
 gocardless-pro~=1.22.0
 googlemaps  # used in ERPNext, but dependency is defined in Frappe