From 0d071c32641135f2ab7ae2b4078b61c6a31eead0 Mon Sep 17 00:00:00 2001 From: Stavros Date: Fri, 5 Jul 2024 14:34:56 +0200 Subject: [PATCH] build(docker): upgraded docker image to ubuntu 24.04 (#211) --- .github/workflows/ci.yml | 34 ++++++++++++++-------------- .github/workflows/release-please.yml | 2 +- .readthedocs.yaml | 4 ++-- Dockerfile | 20 ++++++++-------- requirements.txt | 33 +++++++++++++-------------- setup.py | 2 +- 6 files changed, 46 insertions(+), 49 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae7f1ea..385df6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: [push, pull_request] jobs: lint-commitlint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -36,7 +36,7 @@ jobs: ./run-tests.sh --check-commitlint ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.number }} lint-shellcheck: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: ./run-tests.sh --check-shellcheck lint-black: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Check Python code formatting run: | @@ -64,7 +64,7 @@ jobs: ./run-tests.sh --check-black lint-flake8: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -72,7 +72,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Check compliance with pep8, pyflakes and circular complexity run: | @@ -81,7 +81,7 @@ jobs: ./run-tests.sh --check-flake8 lint-pydocstyle: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -89,7 +89,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Check compliance with Python docstring conventions run: | @@ -98,7 +98,7 @@ jobs: ./run-tests.sh --check-pydocstyle lint-check-manifest: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -106,7 +106,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Check Python manifest completeness run: | @@ -115,7 +115,7 @@ jobs: ./run-tests.sh --check-manifest docs-sphinx: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -123,7 +123,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install system dependencies run: | @@ -140,7 +140,7 @@ jobs: run: ./run-tests.sh --check-sphinx python-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -148,7 +148,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install Python dependencies run: | @@ -166,7 +166,7 @@ jobs: files: coverage.xml lint-dockerfile: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -175,7 +175,7 @@ jobs: run: ./run-tests.sh --check-dockerfile docker-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -184,7 +184,7 @@ jobs: run: ./run-tests.sh --check-docker-build release-docker: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 if: > vars.RELEASE_DOCKER == 'true' && github.event_name == 'push' && diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 253a7a6..b66c368 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -12,7 +12,7 @@ name: release-please jobs: release-please: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: google-github-actions/release-please-action@v4 with: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 1240941..32f7a2d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,9 +7,9 @@ version: 2 build: - os: ubuntu-22.04 + os: ubuntu-24.04 tools: - python: "3.8" + python: "3.12" sphinx: configuration: docs/conf.py diff --git a/Dockerfile b/Dockerfile index 06dad8a..0ad7258 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,17 @@ # This file is part of REANA. -# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023 CERN. +# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023, 2024 CERN. # # REANA is free software; you can redistribute it and/or modify it # under the terms of the MIT License; see LICENSE file for more details. # Use Ubuntu LTS base image -FROM docker.io/library/ubuntu:20.04 +FROM docker.io/library/ubuntu:24.04 # Use default answers in installation commands ENV DEBIAN_FRONTEND=noninteractive -# Use distutils provided by the standard Python library instead of the vendored one in -# setuptools, so that editable installations are stored in the right directory. -# See https://github.com/pypa/setuptools/issues/3301 -ENV SETUPTOOLS_USE_DISTUTILS=stdlib +# Allow pip to install packages in the system site-packages dir +ENV PIP_BREAK_SYSTEM_PACKAGES=true # Prepare list of Python dependencies COPY requirements.txt /code/ @@ -23,16 +21,16 @@ COPY requirements.txt /code/ RUN apt-get update -y && \ apt-get install --no-install-recommends -y \ gcc \ - python3.8 \ - python3-dev \ + python3.12 \ + python3.12-dev \ python3-pip \ vim-tiny && \ - pip install --no-cache-dir --upgrade pip setuptools && \ + pip install --no-cache-dir --upgrade setuptools && \ pip install --no-cache-dir -r /code/requirements.txt && \ apt-get remove -y \ gcc \ - python3-dev && \ - apt-get autoremove -y && \ + python3.12-dev && \ + apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/requirements.txt b/requirements.txt index 2dd2aca..cf4dda7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --annotation-style=line --output-file=requirements.txt setup.py @@ -7,43 +7,42 @@ amqp==5.2.0 # via kombu appdirs==1.4.4 # via fs attrs==23.2.0 # via jsonschema -backports-zoneinfo[tzdata]==0.2.1 # via backports-zoneinfo, kombu bracex==2.4 # via wcmatch bravado==10.3.2 # via reana-commons bravado-core==6.1.0 # via bravado, reana-commons -certifi==2024.2.2 # via requests +certifi==2024.7.4 # via requests charset-normalizer==3.3.2 # via requests checksumdir==1.1.9 # via reana-commons click==8.1.7 # via reana-commons fs==2.4.16 # via reana-commons -idna==3.6 # via jsonschema, requests -jsonpointer==2.4 # via jsonschema +idna==3.7 # via jsonschema, requests +importlib-resources==6.4.0 # via swagger-spec-validator +jsonpointer==3.0.0 # via jsonschema jsonref==1.1.0 # via bravado-core jsonschema[format]==3.2.0 # via bravado-core, reana-commons, swagger-spec-validator -kombu==5.3.5 # via reana-commons +kombu==5.3.7 # via reana-commons markupsafe==2.1.5 # via werkzeug mock==3.0.5 # via reana-commons monotonic==1.6 # via bravado -msgpack==1.0.7 # via bravado-core +msgpack==1.0.8 # via bravado-core msgpack-python==0.5.6 # via bravado pyrsistent==0.20.0 # via jsonschema -python-dateutil==2.9.0 # via bravado, bravado-core +python-dateutil==2.9.0.post0 # via bravado, bravado-core pytz==2024.1 # via bravado-core pyyaml==6.0.1 # via bravado, bravado-core, reana-commons, swagger-spec-validator -reana-commons==0.95.0a2 # via reana-workflow-engine-serial (setup.py) -requests==2.31.0 # via bravado, bravado-core +reana-commons==0.95.0a2 # via reana-workflow-engine-serial (setup.py) +requests==2.32.3 # via bravado, bravado-core rfc3987==1.3.8 # via jsonschema simplejson==3.19.2 # via bravado, bravado-core six==1.16.0 # via bravado, bravado-core, fs, jsonschema, mock, python-dateutil strict-rfc3339==0.7 # via jsonschema -swagger-spec-validator==3.0.3 # via bravado-core -typing-extensions==4.10.0 # via bravado, kombu, swagger-spec-validator -tzdata==2024.1 # via backports-zoneinfo -urllib3==2.2.1 # via requests +swagger-spec-validator==3.0.4 # via bravado-core +typing-extensions==4.12.2 # via bravado, swagger-spec-validator +urllib3==2.2.2 # via requests vine==5.1.0 # via amqp, kombu wcmatch==8.4.1 # via reana-commons -webcolors==1.13 # via jsonschema -werkzeug==3.0.1 # via reana-commons +webcolors==24.6.0 # via jsonschema +werkzeug==3.0.3 # via reana-commons # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools \ No newline at end of file diff --git a/setup.py b/setup.py index a3372df..3b77aac 100755 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP :: Dynamic Content",