From 1bcd617b0b882134985a59c54f6a9895c5de0a47 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Oct 2024 11:40:01 -0400 Subject: [PATCH 1/5] Update CI to 3.13 final --- .github/workflows/main.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 970e7401..53cd94eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,14 +21,11 @@ jobs: matrix: # Test all supported versions on Ubuntu: os: [ubuntu-latest] - python: ["3.9", "3.10", "3.11", "3.12"] + python: ["3.9", "3.10", "3.11", "3.12", "3.13"] experimental: [false] build: [''] include: # As the experimental task for the dev version. - - os: ubuntu-latest - python: "3.13-dev" - experimental: true - os: ubuntu-latest python: "3.13-dev" experimental: true @@ -41,10 +38,10 @@ jobs: python: pypy-3.9 experimental: false - os: macos-latest - python: "3.12" + python: "3.13" experimental: true - os: windows-latest - python: "3.12" + python: "3.13" experimental: true steps: - uses: actions/checkout@v4 From 417897304db5f87854f1919cd7f596528a9b9708 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Oct 2024 11:53:29 -0400 Subject: [PATCH 2/5] Upgrade greenlet --- doc/changelog.rst | 2 ++ .../benchmarks/bm_sqlalchemy_declarative/requirements.txt | 2 +- .../benchmarks/bm_sqlalchemy_imperative/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index 3611e3c5..b0be294d 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* Bump greenlet to 3.1.0 for compatibility with 3.13 + Version 1.11.0 (2024-03-09) -------------- * Add a --same-loops option to the run command to use the exact same number of diff --git a/pyperformance/data-files/benchmarks/bm_sqlalchemy_declarative/requirements.txt b/pyperformance/data-files/benchmarks/bm_sqlalchemy_declarative/requirements.txt index 9578d705..7854731c 100644 --- a/pyperformance/data-files/benchmarks/bm_sqlalchemy_declarative/requirements.txt +++ b/pyperformance/data-files/benchmarks/bm_sqlalchemy_declarative/requirements.txt @@ -1,2 +1,2 @@ -greenlet==3.0.0rc3 +greenlet==3.1.0 sqlalchemy==1.4.19 diff --git a/pyperformance/data-files/benchmarks/bm_sqlalchemy_imperative/requirements.txt b/pyperformance/data-files/benchmarks/bm_sqlalchemy_imperative/requirements.txt index 9578d705..7854731c 100644 --- a/pyperformance/data-files/benchmarks/bm_sqlalchemy_imperative/requirements.txt +++ b/pyperformance/data-files/benchmarks/bm_sqlalchemy_imperative/requirements.txt @@ -1,2 +1,2 @@ -greenlet==3.0.0rc3 +greenlet==3.1.0 sqlalchemy==1.4.19 From ffe6817d0cd2aa070c903de14e185ec8a59313c9 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Oct 2024 15:05:34 -0400 Subject: [PATCH 3/5] Change around experimental flags a bit --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53cd94eb..501fdfbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,10 @@ jobs: python: "3.13-dev" experimental: true build: 'free-threading' + - os: ubuntu-latest + python: "3.14-dev" + experimental: true + build: 'free-threading' # Also test PyPy, macOS, and Windows: - os: ubuntu-latest python: pypy-3.10 @@ -39,10 +43,10 @@ jobs: experimental: false - os: macos-latest python: "3.13" - experimental: true + experimental: false - os: windows-latest python: "3.13" - experimental: true + experimental: false steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }} From b83ff02b7cf3f39fb0d4e028d43624e91dfab938 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Oct 2024 15:06:47 -0400 Subject: [PATCH 4/5] Add 3.14-dev default build as experimental --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 501fdfbd..4482c8b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,9 @@ jobs: python: "3.13-dev" experimental: true build: 'free-threading' + - os: ubuntu-latest + python: "3.14-dev" + experimental: true - os: ubuntu-latest python: "3.14-dev" experimental: true From 1402998e73b23f07e00302c715481fd970b17624 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 23 Oct 2024 16:09:22 -0400 Subject: [PATCH 5/5] Remark macOS and Windows as experimental --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4482c8b9..43c0b0f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,10 +46,10 @@ jobs: experimental: false - os: macos-latest python: "3.13" - experimental: false + experimental: true - os: windows-latest python: "3.13" - experimental: false + experimental: true steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }}