From 6ba9223170225f173cd26c46051f13f9349d27fe Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 7 Jul 2023 10:32:14 +0300 Subject: [PATCH 1/5] Drop support for EOL Python 3.7 --- .github/workflows/workflow.yml | 7 ++----- setup.py | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a62bf21..46b43c9 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.8" cache: pip cache-dependency-path: | .github/workflows/workflow.yml @@ -68,12 +68,9 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.8'] + python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy3.8'] sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7'] os: [windows-latest, macos-latest, ubuntu-latest] - exclude: - # Sphinx 6 supports 3.8+ - - { python-version: '3.7', sphinx-version: '>=6a0,<7' } steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/setup.py b/setup.py index 45b707b..d797402 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: OS Independent", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -39,5 +38,5 @@ "Topic :: Text Processing", "Topic :: Utilities", ], - python_requires=">=3.7", + python_requires=">=3.8", ) From 609eaaeed57b6646c44dd751df40137e2a45b1db Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 7 Jul 2023 10:49:55 +0300 Subject: [PATCH 2/5] Bump Python from 3.7 to 3.11 for Read the Docs --- .readthedocs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 979fd36..cdc9629 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,7 +1,11 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + python: - version: 3 install: - method: pip path: . From ace76acab1b0b008edc22ac9d9c48946d5b0f13e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 7 Jul 2023 12:39:26 +0300 Subject: [PATCH 3/5] Bump tested PyPy from 3.8 to 3.10 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 46b43c9..079695f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy3.8'] + python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy3.10'] sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7'] os: [windows-latest, macos-latest, ubuntu-latest] steps: From 3847b3679126a66eaf65e447f700d91ec84bc2ca Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 7 Jul 2023 12:49:55 +0300 Subject: [PATCH 4/5] Test slower PyPy first to give head start --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 079695f..e1686a1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy3.10'] + python-version: ['pypy3.10', '3.8', '3.9', '3.10', '3.11'] sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7'] os: [windows-latest, macos-latest, ubuntu-latest] steps: From ca31289614c9983208fd51d27d2c1d50cd8f2be2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 7 Jul 2023 12:53:12 +0300 Subject: [PATCH 5/5] Use PyPy3.9 because matplotlib and Pillow both have precompiled wheels --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e1686a1..e1c9b43 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['pypy3.10', '3.8', '3.9', '3.10', '3.11'] + python-version: ['pypy3.9', '3.8', '3.9', '3.10', '3.11'] sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7'] os: [windows-latest, macos-latest, ubuntu-latest] steps: