Move grafyaml to Bookworm and python 3.11

This updates python testing to py311, adjusts the trove identifiers to
match, and switches the docker file to using python3.11 on Bookworm.

The motivation behind this is once OpenDev has updated all services to
Bookworm and python3.11 the old bullseye images and images for older
python versions can be cleaned up.

Change-Id: I3dde845ba05bfec915e19c44959c187162254204
This commit is contained in:
Clark Boylan 2023-09-19 10:35:50 -07:00
parent f6c44782f5
commit 314c160ed4
4 changed files with 10 additions and 15 deletions

View File

@ -21,8 +21,8 @@
allowed-projects: opendev/grafyaml
timeout: 2700
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
provides:
- grafyaml-container-image
dependencies:
@ -40,8 +40,8 @@
description: Build the grafyaml Docker image and upload to Docker Hub.
timeout: 3600
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
provides: grafyaml-container-image
vars: *grafyaml_image_vars
secrets:
@ -65,7 +65,7 @@
check:
jobs:
- tox-pep8
- tox-py310:
- tox-py311:
nodeset: ubuntu-jammy
- opendev-buildset-registry
- grafyaml-build-image
@ -73,7 +73,7 @@
gate:
jobs:
- tox-pep8
- tox-py310:
- tox-py311:
nodeset: ubuntu-jammy
- grafyaml-upload-image
promote:

View File

@ -14,12 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
COPY . /tmp/src
RUN assemble
FROM docker.io/opendevorg/python-base:3.10-bullseye
FROM docker.io/opendevorg/python-base:3.11-bookworm
COPY --from=builder /output/ /output
RUN /output/install-from-bindep

View File

@ -16,12 +16,7 @@ classifier =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Utilities
[files]

View File

@ -1,6 +1,6 @@
[tox]
minversion = 3.1.1
envlist = docs,pep8,py35,py36,py37,py38
envlist = docs,pep8,py311
ignore_basepython_conflict = True
[testenv]