From cc35c2af1eb03adfc7e9bf9c87cf0c9888bb4d28 Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Wed, 9 Apr 2025 16:15:45 -0700 Subject: [PATCH 1/5] Update CHANGES.md to correct a typo that 3.8 was removed in 0.11.1 when it was 3.7 --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d0afe135f..e4121e0c9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -54,7 +54,7 @@ * Add support for large decimals with >34 digits. (#293) ### 0.11.1 (2023-10-09) -* Drops the support for Python versions older than 3.8. +* Drops the support for Python versions older than 3.7 (#292). ### 0.11.0 (2023-10-09) * Refactors the benchmark tool From 5e2776bc9024ccc184cfdddde80dcacd728f41d6 Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Wed, 9 Apr 2025 16:17:36 -0700 Subject: [PATCH 2/5] Update minimum version for the project to 3.9 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index aae933c3c..2c94d006e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "amazon-ion" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" license = { "file" = "LICENSE" } authors = [{ "name" = "Amazon Ion Team", "email" = "ion-team@amazon.com" }] keywords = [] From 5a443d0098a4741517ef0a09510b764b6d9ad592 Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Wed, 9 Apr 2025 16:18:38 -0700 Subject: [PATCH 3/5] Update workflows to include the current set of supported versions, removing 3.8; Merge linux and windows jobs since 3.8 is gone --- .github/workflows/main.yml | 26 +++----------------------- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb817102c..482305cf0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.8', 'pypy-3.10'] - os: [ macos-latest, ubuntu-latest ] + # Python maintains 5 versions, along with the to-be-released version. Every October, this changes. + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.10'] + os: [ macos-latest, ubuntu-latest, windows-latest ] fail-fast: false steps: - uses: actions/checkout@v4 @@ -25,24 +26,3 @@ jobs: - run: python -m pip install '.[test]' # Run our tests, but do not run the benchmark tests since they pull in libraries that do not have pypy support. - run: py.test --ignore tests/test_benchmark_cli.py --ignore tests/test_benchmark_spec.py - - test-windows: - runs-on: windows-latest - strategy: - matrix: - python-version: ['3.9', '3.10', '3.11', 'pypy-3.8', 'pypy-3.10'] - fail-fast: false - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Create a virtual environment - run: git submodule init && git submodule update && python3 -m venv ./venv && . venv/Scripts/activate - - run: python -m pip install build - - run: python -m build - - run: python -m pip install -e '.[test]' - # Run our tests, but do not run the benchmark tests since they pull in libraries that do not have pypy support. - - run: py.test --ignore tests/test_benchmark_cli.py --ignore tests/test_benchmark_spec.py diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13fa1f87b..47ef6143b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.8'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8'] steps: - uses: actions/checkout@v4 - name: Set up python From ebfaa29f9fd8627fa8211fd48236eda21151b89a Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Wed, 9 Apr 2025 16:38:10 -0700 Subject: [PATCH 4/5] Update workflow to remove pypy-3.8, add pypy-3.11, and handle windows virtual environment activation --- .github/workflows/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 482305cf0..285a9e251 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: # Python maintains 5 versions, along with the to-be-released version. Every October, this changes. - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.10'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.10', 'pypy-3.11'] os: [ macos-latest, ubuntu-latest, windows-latest ] fail-fast: false steps: @@ -21,7 +21,15 @@ jobs: python-version: ${{ matrix.python-version }} - name: Create a virtual environment - run: git submodule init && git submodule update && python3 -m venv ./venv && . venv/bin/activate + run: git submodule init && git submodule update && python3 -m venv ./venv + + - name: Activate Virtual Environment for Windows. + if: matrix.os == 'windows-latest' + run: . venv/Scripts/activate + - name: Activate Virtual Environment for Linux and Mac + if: matrix.os != 'windows-latest' + run: . venv/bin/activate + - run: python -m pip install build - run: python -m pip install '.[test]' # Run our tests, but do not run the benchmark tests since they pull in libraries that do not have pypy support. From 6d4f25cb545778cfbd9d5709676d365606182c82 Mon Sep 17 00:00:00 2001 From: Richard Giliam Date: Wed, 9 Apr 2025 16:56:34 -0700 Subject: [PATCH 5/5] Remove pypy 3.11 since it breaks; remove py3.8 from tox config --- .github/workflows/main.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 285a9e251..5075d24b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: # Python maintains 5 versions, along with the to-be-released version. Every October, this changes. - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.10', 'pypy-3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.10'] os: [ macos-latest, ubuntu-latest, windows-latest ] fail-fast: false steps: diff --git a/pyproject.toml b/pyproject.toml index 2c94d006e..9a7556be5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ testpaths = ["tests"] # running our default unit tests (minus benchmarking related tests). This ensures that we # can easily test against supported python versions. [tool.tox] -envlist = ["py3.8", "py3.9", "pypy3"] # default environments to run. +envlist = ["py3.9", "pypy3"] # default environments to run. [tool.tox.env_run_base] extras = ["test"]