From bd3d7bf3edada674da5ffdb97c408fd3a9cdc619 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 29 Jun 2022 10:44:55 +0530 Subject: [PATCH 1/3] ci: Run test builds on min requirement PY38 Since version pinned in pyproject.toml is 38 & we've been running on 39, we've pushed a few incompatible changes since :crie: --- .github/workflows/patch-mariadb-tests.yml | 2 +- .github/workflows/publish-assets-develop.yml | 2 +- .github/workflows/publish-assets-releases.yml | 2 +- .github/workflows/server-mariadb-tests.yml | 2 +- .github/workflows/server-postgres-tests.yml | 2 +- .github/workflows/ui-tests.yml | 2 +- frappe/utils/boilerplate.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 60d0ce60af..8cfae52525 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Setup Node uses: actions/setup-node@v3 diff --git a/.github/workflows/publish-assets-develop.yml b/.github/workflows/publish-assets-develop.yml index 037c8c26eb..bd387a1c06 100644 --- a/.github/workflows/publish-assets-develop.yml +++ b/.github/workflows/publish-assets-develop.yml @@ -18,7 +18,7 @@ jobs: node-version: 14 - uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Set up bench and build assets run: | npm install -g yarn diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/publish-assets-releases.yml index 594229a156..e3f316fd57 100644 --- a/.github/workflows/publish-assets-releases.yml +++ b/.github/workflows/publish-assets-releases.yml @@ -21,7 +21,7 @@ jobs: python-version: '12.x' - uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Set up bench and build assets run: | npm install -g yarn diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 51d379d5db..a32e18ae7b 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -42,7 +42,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Check if build should be run id: check-build diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index d93edad0ec..8ff56f74f3 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -45,7 +45,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Check if build should be run id: check-build diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 09b2a3caf8..96f3869788 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.8' - name: Check if build should be run id: check-build diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index edb742feb4..de55a9b2ea 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -478,7 +478,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.8 - name: Setup Node uses: actions/setup-node@v2 From 091debb14fbcd646eb6569066309723a91d239bb Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 29 Jun 2022 10:56:05 +0530 Subject: [PATCH 2/3] chore: Stringify incompatible typing hints --- frappe/email/queue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 45abe0374a..2c3e0ee011 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -69,7 +69,7 @@ def get_emails_sent_today(email_account=None): def get_unsubscribe_message( unsubscribe_message: str, expose_recipients: str -) -> frappe._dict[str, str]: +) -> "frappe._dict[str, str]": unsubscribe_message = unsubscribe_message or _("Unsubscribe") unsubscribe_link = f'{unsubscribe_message}' unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link) From 6862c104032626c9dbd4d90334754d060d585206 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 29 Jun 2022 11:04:01 +0530 Subject: [PATCH 3/3] ci: PY38 compatible roulette --- .github/helper/roulette.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index b859b87047..ad2fd829dd 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -5,10 +5,10 @@ import shlex import subprocess import sys import urllib.request -from functools import cache +from functools import lru_cache -@cache +@lru_cache(maxsize=None) def fetch_pr_data(pr_number, repo, endpoint): api_url = f"https://api.github.com/repos/{repo}/pulls/{pr_number}"