Skip to content

Commit

Permalink
[COST-5076] upgrade to python 3.11 (#4444)
Browse files Browse the repository at this point in the history
* upgrade to python 3.11

* pipfile update

* add gcc-c++ compiler

Co-authored-by: Sam Doran <[email protected]>

* update test

* replace gcc with gcc-c++

---------

Co-authored-by: Sam Doran <[email protected]>
  • Loading branch information
maskarb and samdoran committed Jul 2, 2024
1 parent 0507abb commit 89feae0
Show file tree
Hide file tree
Showing 5 changed files with 780 additions and 717 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Python
uses: actions/[email protected]
with:
python-version: '3.9'
python-version: '3.11'

- name: Run pre-commit checks
uses: pre-commit/[email protected]
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
max-parallel: 4
matrix:
python-version:
- '3.9'
- '3.11'
env:
COMPOSE_FILE: .github/postgres/docker-compose.yaml

Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS base

USER root

ENV PYTHON_VERSION=3.9 \
ENV PYTHON_VERSION=3.11 \
PYTHONUNBUFFERED=1 \
PYTHONIOENCODING=UTF-8 \
LC_ALL=en_US.UTF-8 \
Expand All @@ -24,8 +24,8 @@ LABEL summary="$SUMMARY" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="Koku" \
io.openshift.expose-services="8000:http" \
io.openshift.tags="builder,python,python39,rh-python39" \
com.redhat.component="python39-docker" \
io.openshift.tags="builder,python,python3.11,rh-python3.11" \
com.redhat.component="python3.11-docker" \
name="Koku" \
version="1" \
maintainer="Red Hat Cost Management Services <[email protected]>"
Expand All @@ -35,7 +35,7 @@ LABEL summary="$SUMMARY" \
# gcc to compile some python packages (e.g. ciso8601)
# shadow-utils to make useradd available
# libpq-devel needed for building psycopg2
RUN INSTALL_PKGS="python39 python39-devel glibc-langpack-en gcc shadow-utils libpq-devel" && \
RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc-c++ shadow-utils libpq-devel" && \
microdnf --nodocs -y upgrade && \
microdnf reinstall tzdata && \
microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
Expand Down Expand Up @@ -72,7 +72,7 @@ ARG USER_ID=1000
# Create a Python virtual environment for use by any application to avoid
# potential conflicts with Python packages preinstalled in the main Python
# installation.
RUN python3.9 -m venv /pipenv-venv \
RUN python3.11 -m venv /pipenv-venv \
&& /pipenv-venv/bin/python -m pip install --upgrade pip setuptools \
&& /pipenv-venv/bin/python -m pip install pipenv

Expand Down
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ azure-mgmt-compute = "*"
azure-mgmt-resource = ">=8.0"
azure-mgmt-storage = ">=20.1.0"
azure-storage-blob = ">=12.1"
boto3 = ">=1.10"
boto3 = ">=1.34"
bs4 = ">=0.0.1"
cachetools = ">=4.1.0"
celery = ">=5.2.2"
Expand Down Expand Up @@ -85,4 +85,4 @@ tox = ">=3.0"
watchdog = ">=2.1.1"

[requires]
python_version = "3.9"
python_version = "3.11"
Loading

0 comments on commit 89feae0

Please sign in to comment.