From 07ba05630e7e5e96a873a75f38160e108faf6fd8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 27 May 2021 15:29:41 +0530 Subject: [PATCH 1/3] fix: Add future in requirements.txt Since future is removed from frappe, adding it as a dependency here --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index f1ffeb8f48..65688f41e0 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 From f93a7a72c1142068e69cfb01367d16b218e945d0 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 27 May 2021 15:36:26 +0530 Subject: [PATCH 2/3] ci(test): Temporary change to test PY2 compatability removal in Frappe --- .github/helper/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 7b0f944c66..8020408904 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -12,7 +12,7 @@ sudo apt install npm 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 From 62996ec980fa23e0b4c58a8f8286904109e44bdc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 28 May 2021 23:06:15 +0530 Subject: [PATCH 3/3] Revert "ci(test): Temporary change to test PY2 compatability removal in Frappe" This reverts commit f93a7a72c1142068e69cfb01367d16b218e945d0. --- .github/helper/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 8020408904..7b0f944c66 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -12,7 +12,7 @@ sudo apt install npm pip install frappe-bench -git clone https://github.com/gavindsouza/frappe --branch drop-py2-code --depth 1 +git clone https://github.com/frappe/frappe --branch "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" --depth 1 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench mkdir ~/frappe-bench/sites/test_site