From c00488f281bd735382e1430610dc0b7f4c1c6815 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 3 Aug 2024 06:27:59 +0900 Subject: [PATCH 1/4] Use 3.12 for formatting check --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60f8b79c03..f457740bdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: no_test_requirements: ['0'] extra_name: [''] include: - - python: '3.8' + - python: '3.12' check_formatting: '1' extra_name: ', check formatting' # separate test run that doesn't install test-requirements.txt From 984919f50ecbfd39067cd3f611e03dd5ac267f1e Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 3 Aug 2024 06:41:31 +0900 Subject: [PATCH 2/4] Always install `exceptiongroups` --- test-requirements.in | 2 +- test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.in b/test-requirements.in index af8a751b13..405a9d5ce4 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -34,4 +34,4 @@ idna outcome sniffio # 1.2.1 fixes types -exceptiongroup >= 1.2.1; python_version < "3.11" +exceptiongroup >= 1.2.1 diff --git a/test-requirements.txt b/test-requirements.txt index 3dec7a570b..6afcd175f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -46,7 +46,7 @@ dill==0.3.8 # via pylint docutils==0.20.1 # via sphinx -exceptiongroup==1.2.1 ; python_version < '3.11' +exceptiongroup==1.2.1 # via # -r test-requirements.in # pytest From aaa3f3422f485b2acc0091c6f34f714bac84f4eb Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 3 Aug 2024 06:45:00 +0900 Subject: [PATCH 3/4] Install `exceptiongroup` always but not in tests --- ci.sh | 2 +- test-requirements.in | 2 +- test-requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci.sh b/ci.sh index 112ed04d7a..e62946a4de 100755 --- a/ci.sh +++ b/ci.sh @@ -44,7 +44,7 @@ python -m build python -m pip install dist/*.whl if [ "$CHECK_FORMATTING" = "1" ]; then - python -m pip install -r test-requirements.txt + python -m pip install -r test-requirements.txt exceptiongroup echo "::endgroup::" source check.sh else diff --git a/test-requirements.in b/test-requirements.in index 405a9d5ce4..af8a751b13 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -34,4 +34,4 @@ idna outcome sniffio # 1.2.1 fixes types -exceptiongroup >= 1.2.1 +exceptiongroup >= 1.2.1; python_version < "3.11" diff --git a/test-requirements.txt b/test-requirements.txt index 6afcd175f6..de98991fbe 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -46,7 +46,7 @@ dill==0.3.8 # via pylint docutils==0.20.1 # via sphinx -exceptiongroup==1.2.1 +exceptiongroup==1.2.1 ; python_version < "3.11" # via # -r test-requirements.in # pytest From f11f04440f3334e74826d184aa5905b0802fe6c2 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 3 Aug 2024 06:50:08 +0900 Subject: [PATCH 4/4] Use single quotes in compiled requirements --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index de98991fbe..3dec7a570b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -46,7 +46,7 @@ dill==0.3.8 # via pylint docutils==0.20.1 # via sphinx -exceptiongroup==1.2.1 ; python_version < "3.11" +exceptiongroup==1.2.1 ; python_version < '3.11' # via # -r test-requirements.in # pytest