From 716854274bbca5bb5d061c8f36e237c12d229ac5 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 May 2024 13:42:37 +0200 Subject: [PATCH 1/4] ci: Bump Pypy version --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 97d73356f..6027b8aef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,11 +33,11 @@ jobs: - python-version: "3.10" with-opt-deps: false runs-on: ubuntu-22.04 - - - python-version: "3.9" + - python-version: "pypy-3.10" with-opt-deps: true runs-on: ubuntu-22.04 - - python-version: "pypy-3.9" + + - python-version: "3.9" with-opt-deps: true runs-on: ubuntu-22.04 From 61a8a4816d13dc78b0d0bbbceec54e0082bb0aa5 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 May 2024 14:19:10 +0200 Subject: [PATCH 2/4] Math: update test --- plugins/Math/test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/Math/test.py b/plugins/Math/test.py index 22578c9ed..160d8f768 100644 --- a/plugins/Math/test.py +++ b/plugins/Math/test.py @@ -141,9 +141,10 @@ def testCalcStrFloat(self): def testCalcMemoryError(self): self.assertRegexp('calc ' + '('*10000, - '(too much recursion' # cpython < 3.10 - '|too many nested parentheses' # cpython >= 3.10 - '|parenthesis is never closed)' # pypy + r"(too much recursion" # cpython < 3.10 + r"|too many nested parentheses" # cpython >= 3.10 + r"|parenthesis is never closed" # pypy for python < 3.10 + r"|'\(' was never closed)" # pypy for python >= 3.10 ) def testICalc(self): From 22b223c955d0b6b9307ba84d4b0a55bba623f7ae Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 May 2024 14:46:59 +0200 Subject: [PATCH 3/4] cryptography doesn't work on pypy3.10? --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6027b8aef..ffd998acb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,12 +34,15 @@ jobs: with-opt-deps: false runs-on: ubuntu-22.04 - python-version: "pypy-3.10" - with-opt-deps: true + with-opt-deps: false runs-on: ubuntu-22.04 - python-version: "3.9" with-opt-deps: true runs-on: ubuntu-22.04 + - python-version: "pypy-3.10" + with-opt-deps: true + runs-on: ubuntu-22.04 - python-version: "3.8" with-opt-deps: true From 8b3d88a1e36991861b3c7c155f1966678f10e029 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 May 2024 22:00:35 +0200 Subject: [PATCH 4/4] Fix copy-paste --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ffd998acb..2345ef63a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: - python-version: "3.9" with-opt-deps: true runs-on: ubuntu-22.04 - - python-version: "pypy-3.10" + - python-version: "pypy-3.9" with-opt-deps: true runs-on: ubuntu-22.04