From 350deb8f3ed8e29be9a1471d02624fc32d6619aa Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 14 Nov 2024 15:32:26 +0200 Subject: [PATCH 1/2] chore: drop support for python3.7, support python3.13, remove legacy references to python3.6 --- .devcontainer/Dockerfile | 8 ++++---- .devcontainer/devcontainer.json | 2 +- .github/workflows/pull_request.yml | 2 +- docs/development.rst | 2 +- pyproject.toml | 4 ++-- tox.ini | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a46c2f93..d388b739 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster -ARG VARIANT=3.7 +# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster +ARG VARIANT=3.8 FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT} # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 @@ -21,8 +21,8 @@ RUN git clone --depth=1 https://github.com/pyenv/pyenv.git .pyenv ENV PYENV_ROOT="/home/vscode/.pyenv" ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH" -RUN pyenv install 3.7 3.8 3.9 3.10 3.11 3.12 -RUN pyenv local 3.7 3.8 3.9 3.10 3.11 3.12 +RUN pyenv install 3.8 3.9 3.10 3.11 3.12 3.13 +RUN pyenv local 3.8 3.9 3.10 3.11 3.12 3.13 RUN pyenv global ${VARIANT} # Set up pyenv-virtualenv diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1b8de44d..f50bf42b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "dockerfile": "Dockerfile", "context": "..", "args": { - // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 + // Update 'VARIANT' to pick a Python version: 3, 3.13, 3.12, 3.11, 3.10, 3.9, 3.8 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local on arm64/Apple Silicon. "VARIANT": "3.10", diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8cf02edb..f5b8ab0b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 - name: Setup Python diff --git a/docs/development.rst b/docs/development.rst index 026728bf..a62e1d6b 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -23,7 +23,7 @@ Running Tox locally ####################################### 1. Install Python versions for each supported version. 2. Deactivate your local virtualenv (if it's activated). -3. Run ``pyenv local 3.10.X 3.9.Y 3.8.Z 3.7.12`` (inserting appropriate patch versions). +3. Run ``pyenv local 3.13.X 3.12.X 3.111.X 3.10.X 3.9.Y 3.8.Z`` (inserting appropriate patch versions). 4. Run ``make install`` to get latest local dependencies. 5. Run ``make tox`` to run tox. diff --git a/pyproject.toml b/pyproject.toml index 9014e6b2..cfd3c232 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,18 +9,18 @@ authors = [ description = "Python client for the Unleash feature toggle system!" dynamic = ["version"] readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Typing :: Typed", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] dependencies=[ diff --git a/tox.ini b/tox.ini index 3ef9af2e..d53bb7c2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py37,py38,py39,py310,py311 +envlist = py38,py39,py310,py311,py312,py313 [testenv] deps = -rrequirements.txt From b02ea290a38d0db8d669378711e559e85c7bc189 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 14 Nov 2024 17:59:09 +0200 Subject: [PATCH 2/2] Update docs/development.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Nuno Góis --- docs/development.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development.rst b/docs/development.rst index a62e1d6b..779739c2 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -23,7 +23,7 @@ Running Tox locally ####################################### 1. Install Python versions for each supported version. 2. Deactivate your local virtualenv (if it's activated). -3. Run ``pyenv local 3.13.X 3.12.X 3.111.X 3.10.X 3.9.Y 3.8.Z`` (inserting appropriate patch versions). +3. Run ``pyenv local 3.13.X 3.12.X 3.11.X 3.10.X 3.9.Y 3.8.Z`` (inserting appropriate patch versions). 4. Run ``make install`` to get latest local dependencies. 5. Run ``make tox`` to run tox.