From e6dec995ff843339806b56fee3a3eaf5331181f0 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:53:10 +0530 Subject: [PATCH 1/7] Reformat --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 27ee5d6..54ac88d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,13 +5,13 @@ authors = [ ] description = "HTML5 backends for Matplotlib compatible with Pyodide" readme = "README.md" -license = { file="LICENSE" } requires-python = ">=3.10" +license = { file = "LICENSE" } dynamic = ["version"] classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)", - "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)", + "Operating System :: OS Independent", ] [build-system] From 8eb38019e15be42797a210275e739c1f1e1eded2 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:53:36 +0530 Subject: [PATCH 2/7] Require 3.12, bump setuptools, remove wheel --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 54ac88d..20cf90f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,8 @@ authors = [ ] description = "HTML5 backends for Matplotlib compatible with Pyodide" readme = "README.md" -requires-python = ">=3.10" license = { file = "LICENSE" } +requires-python = ">=3.12" dynamic = ["version"] classifiers = [ "Programming Language :: Python :: 3", @@ -15,7 +15,7 @@ classifiers = [ ] [build-system] -requires = ["setuptools>=42", "setuptools_scm[toml]>=6.2", "wheel"] +requires = ["setuptools>=71", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" From 7f0f3454f9805d385195560640731dc0e12fdc6a Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:53:48 +0530 Subject: [PATCH 3/7] Require Python 3.12 for Mypy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 20cf90f..49284ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ known_first_party = [ ] [tool.mypy] -python_version = "3.10" +python_version = "3.12" show_error_codes = true warn_unreachable = true ignore_missing_imports = true From 92d3a188bd6415d021b0ca86b862b627bc18dff1 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:54:18 +0530 Subject: [PATCH 4/7] Bump Pyodide version, Python, and GHA versions --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee406b9..2b12619 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,17 +18,17 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - pyodide-version: [0.25.0] + pyodide-version: [0.26.4] test-config: [ {runner: selenium, runtime: chrome, runtime-version: latest}, ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - uses: pyodide/pyodide-actions/download-pyodide@v1 with: @@ -63,11 +63,11 @@ jobs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') environment: PyPi-deploy steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install requirements and build wheel shell: bash -l {0} run: | From e6766a6b5bcb7ae83052f822bfbdbe3f2e5b0546 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:41:07 +0530 Subject: [PATCH 5/7] Coloured output for all tests --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b12619..4acc85a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,9 @@ name: main on: [push, pull_request] +env: + FORCE_COLOR: 3 + permissions: contents: read From 5dfb407ae323acad212479cdf1dc0191755216dc Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:42:17 +0530 Subject: [PATCH 6/7] Don't shallow-clone repository --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4acc85a..2504a04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: actions/setup-python@v5 with: From 0068c8a362da10bb427a8c7eb3de21d5ffca9234 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:24:29 +0530 Subject: [PATCH 7/7] Pin to Chrome 125 and bump install-browser action Co-Authored-By: Gyeongjae Choi --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2504a04..ac220bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,8 @@ jobs: os: [ubuntu-latest] pyodide-version: [0.26.4] test-config: [ - {runner: selenium, runtime: chrome, runtime-version: latest}, + # FIXME: timeouts on recent versions of Chrome, same as micropip + {runner: selenium, runtime: chrome, runtime-version: 125}, ] steps: @@ -40,7 +41,7 @@ jobs: version: ${{ matrix.pyodide-version }} to: dist - - uses: pyodide/pyodide-actions/install-browser@v1 + - uses: pyodide/pyodide-actions/install-browser@v2 with: runner: ${{ matrix.test-config.runner }} browser: ${{ matrix.test-config.runtime }}