Skip to content

Commit

Permalink
build(docker): upgrade to Ubuntu 24.04 and Python 3.12 (#810)
Browse files Browse the repository at this point in the history
Closes #808
  • Loading branch information
mdonadoni committed Aug 6, 2024
1 parent 9698c63 commit 69eb86b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -47,31 +47,31 @@ 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

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"

- name: Check Python code formatting
run: |
pip install black
./run-tests.sh --check-black
lint-flake8:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4

- 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: |
Expand All @@ -80,47 +80,47 @@ 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

- 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: |
pip install pydocstyle
./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

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"

- name: Check Python manifest completeness
run: |
pip install check-manifest
./run-tests.sh --check-manifest
docs-sphinx:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"

- name: Install system dependencies
run: |
Expand All @@ -137,15 +137,15 @@ 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

- name: Set up Python 3.8
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.12"

- name: Install Python dependencies
run: |
Expand All @@ -163,7 +163,7 @@ jobs:
files: coverage.xml

lint-helm:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions reana/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@
CODECOV_REANAHUB_URL = "https://codecov.io/gh/reanahub"
"""REANA Hub organisation Codecov URL."""

PYTHON_EXECUTABLE_NAME = "python3.8"
PYTHON_EXECUTABLE_NAME = "python3.12"
"""Python executable name with the same version as cluster components."""

PYTHON_DOCKER_IMAGE = "docker.io/library/python:3.8"
PYTHON_DOCKER_IMAGE = "docker.io/library/python:3.12"
"""Python docker image with the same version as cluster components."""

RELEASE_COMMIT_REGEX = re.compile("^(release:|chore.*: release)")
Expand Down
6 changes: 3 additions & 3 deletions reana/reana_dev/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,11 +802,11 @@ def _bump_dev_post_pre(dev_post_pre_number):
f"{version.major}.{version.minor}.{version.micro}{dev_post_pre_part}"
)
elif (part and part == "micro") or (isinstance(version.micro, int) and not part):
next_version = Version(f"{version.major}.{version.minor}.{version.micro+1}")
next_version = Version(f"{version.major}.{version.minor}.{version.micro + 1}")
elif (part and part == "minor") or (isinstance(version.minor, int) and not part):
next_version = Version(f"{version.major}.{version.minor+1}.0")
next_version = Version(f"{version.major}.{version.minor + 1}.0")
elif (part and part == "major") or (isinstance(version.major, int) and not part):
next_version = Version(f"{version.major+1}.0.0")
next_version = Version(f"{version.major + 1}.0.0")

return str(next_version)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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",
Expand Down

0 comments on commit 69eb86b

Please sign in to comment.