From 2c33e62c53da10ee6f23f2e14427c2fb440ea0c2 Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Wed, 6 Mar 2024 14:40:13 +0000 Subject: [PATCH 1/2] Update Python version to 3.11 --- Dockerfile | 4 ++-- pyproject.toml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13cce1505..90c2f35e7 100644 --- a/Dockerfile +++ b/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.10 as build +FROM python:3.11 as build ARG PIP_OPTIONS=. @@ -24,7 +24,7 @@ WORKDIR /context # install python package into /venv RUN pip install ${PIP_OPTIONS} -FROM python:3.10-slim as runtime +FROM python:3.11-slim as runtime # Add apt-get system dependecies for runtime here if needed diff --git a/pyproject.toml b/pyproject.toml index 0a85bfa6a..8c2ae043c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ name = "fastcs" classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", ] description = "Control system agnostic framework for building Device support in Python that will work for both EPICS and Tango" @@ -20,7 +19,7 @@ dependencies = [ dynamic = ["version"] license.file = "LICENSE" readme = "README.rst" -requires-python = ">=3.10" +requires-python = ">=3.11" [project.optional-dependencies] dev = [ From 0bed12fb87d18cee56d7936247d8051f2316e0ef Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Wed, 6 Mar 2024 14:48:07 +0000 Subject: [PATCH 2/2] Update code.yml in workflows --- .github/workflows/code.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index bf0d3d58c..a0b76fb94 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -32,12 +32,12 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] # can add windows-latest, macos-latest - python: ["3.10", "3.11"] + python: ["3.11"] install: ["-e .[dev]"] # Make one version be non-editable to test both paths of version code include: - os: "ubuntu-latest" - python: "3.10" + python: "3.11" install: ".[dev]" runs-on: ${{ matrix.os }}