From f7f651c44c4eb31cb7e5163d86c77282e7198ac7 Mon Sep 17 00:00:00 2001 From: David Perl <115003895+dperl-dls@users.noreply.github.com> Date: Mon, 15 Apr 2024 10:37:36 +0100 Subject: [PATCH] Drop python 3.9 support (#171) * drop python 3.9 support * drop python 3.9 support * add 3.10 editable test --- .devcontainer/Dockerfile | 4 ++-- .github/actions/install_requirements/action.yml | 2 +- .github/workflows/code.yml | 4 ++-- docs/developer/how-to/pin-requirements.rst | 2 +- docs/developer/tutorials/dev-install.rst | 2 +- docs/user/tutorials/installation.rst | 2 +- pyproject.toml | 3 +-- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 349a45cc6f..901909949d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # The devcontainer should use the build target and run as root with podman # or docker with user namespaces. # -FROM python:3.9 as build +FROM python:3.10 as build ARG PIP_OPTIONS @@ -24,7 +24,7 @@ WORKDIR /context # install python package into /venv RUN pip install ${PIP_OPTIONS} -FROM python:3.9-slim as runtime +FROM python:3.10-slim as runtime # Add apt-get system dependecies for runtime here if needed diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index 89889a65ac..84be1b910f 100644 --- a/.github/actions/install_requirements/action.yml +++ b/.github/actions/install_requirements/action.yml @@ -9,7 +9,7 @@ inputs: required: true python_version: description: Python version to install - default: "3.9" + default: "3.10" runs: using: composite diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 012a373de7..41381549fb 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -29,12 +29,12 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] # can add windows-latest, macos-latest - python: ["3.10", "3.11"] + python: ["3.10","3.11"] # 3.12 should be added when p4p is updated install: ["-e .[dev]"] # Make one version be non-editable to test both paths of version code include: - os: "ubuntu-latest" - python: "3.9" + python: "3.10" install: ".[dev]" runs-on: ${{ matrix.os }} diff --git a/docs/developer/how-to/pin-requirements.rst b/docs/developer/how-to/pin-requirements.rst index e42226fbcf..278bdeed18 100644 --- a/docs/developer/how-to/pin-requirements.rst +++ b/docs/developer/how-to/pin-requirements.rst @@ -46,7 +46,7 @@ of the dependencies and sub-dependencies with pinned versions. You can download any of these files by clicking on them. It is best to use the one that ran with the lowest Python version as this is more likely to be compatible with all the versions of Python in the test matrix. -i.e. ``requirements-test-ubuntu-latest-3.9.txt`` in this example. +i.e. ``requirements-test-ubuntu-latest-3.10.txt`` in this example. Applying the lock file ---------------------- diff --git a/docs/developer/tutorials/dev-install.rst b/docs/developer/tutorials/dev-install.rst index 59f16a919b..0a32bd19a2 100644 --- a/docs/developer/tutorials/dev-install.rst +++ b/docs/developer/tutorials/dev-install.rst @@ -16,7 +16,7 @@ Install dependencies -------------------- You can choose to either develop on the host machine using a `venv` (which -requires python 3.9 or later) or to run in a container under `VSCode +requires python 3.10 or later) or to run in a container under `VSCode `_ .. tab-set:: diff --git a/docs/user/tutorials/installation.rst b/docs/user/tutorials/installation.rst index 9e310adbce..73874b60cf 100644 --- a/docs/user/tutorials/installation.rst +++ b/docs/user/tutorials/installation.rst @@ -9,7 +9,7 @@ Installation Check your version of python ---------------------------- -You will need python 3.9 or later. You can check your version of python by +You will need python 3.10 or later. You can check your version of python by typing into a terminal:: $ python3 --version diff --git a/pyproject.toml b/pyproject.toml index 8c6b0753c1..8f7da05a67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ name = "ophyd-async" classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", ] @@ -27,7 +26,7 @@ dependencies = [ dynamic = ["version"] license.file = "LICENSE" readme = "README.rst" -requires-python = ">=3.9" +requires-python = ">=3.10" [project.optional-dependencies] ca = ["aioca>=1.6"]