From 4a5e5a1a6c1faad0eda0356e1d59402ba9dcb36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Fri, 15 Mar 2024 10:12:12 +0100 Subject: [PATCH] chore(master): release 0.95.0-alpha.1 Release-As: 0.95.0 build(docker): upgraded docker image to ubuntu 24.04 (#211) ci(actions): update GitHub actions due to Node 16 deprecation (#204) build(docker): upgraded docker image to ubuntu 24.04 (#211) --- .commitlintrc.yaml | 2 +- .github/workflows/ci.yml | 70 +++++++++++++------------ .readthedocs.yaml | 4 +- AUTHORS.md | 1 + Dockerfile | 22 ++++---- reana_workflow_engine_serial/version.py | 2 +- requirements.txt | 48 +++++++++-------- setup.py | 5 +- 8 files changed, 81 insertions(+), 73 deletions(-) diff --git a/.commitlintrc.yaml b/.commitlintrc.yaml index d0b3278..67b733c 100644 --- a/.commitlintrc.yaml +++ b/.commitlintrc.yaml @@ -1,6 +1,6 @@ rules: body-case: [2, always, sentence-case] - body-full-stop: [2, always] + body-full-stop: [1, always] body-leading-blank: [2, always] body-max-line-length: [2, always, 72] footer-leading-blank: [2, always] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f464f5e..f44cf84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ on: [push, pull_request] jobs: lint-commitlint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -36,10 +36,10 @@ 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@v3 + uses: actions/checkout@v4 - name: Runs shell script static analysis run: | @@ -47,15 +47,15 @@ jobs: ./run-tests.sh --check-shellcheck lint-black: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Check Python code formatting run: | @@ -64,15 +64,15 @@ jobs: ./run-tests.sh --check-black lint-flake8: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + 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,15 +81,15 @@ jobs: ./run-tests.sh --check-flake8 lint-pydocstyle: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Check compliance with Python docstring conventions run: | @@ -98,15 +98,15 @@ 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@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Check Python manifest completeness run: | @@ -115,15 +115,15 @@ jobs: ./run-tests.sh --check-manifest docs-sphinx: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Install system dependencies run: | @@ -140,15 +140,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@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.12" - name: Install Python dependencies run: | @@ -160,31 +160,31 @@ jobs: run: ./run-tests.sh --check-pytest - name: Codecov Coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml lint-dockerfile: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check Dockerfile compliance run: ./run-tests.sh --check-dockerfile docker-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build Docker image 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' && @@ -193,6 +193,7 @@ jobs: - docs-sphinx - lint-black - lint-check-manifest + - lint-commitlint - lint-dockerfile - lint-flake8 - lint-pydocstyle @@ -209,3 +210,4 @@ jobs: platform: | linux/amd64 linux/arm64 + 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/AUTHORS.md b/AUTHORS.md index 7ada2b7..b7419ee 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -15,5 +15,6 @@ The list of contributors in alphabetical order: - [Marco Vidal](https://orcid.org/0000-0002-9363-4971) - [Rokas Maciulaitis](https://orcid.org/0000-0003-1064-6967) - [Sinclert Perez](https://www.linkedin.com/in/sinclert) +- [Stavros Moiras](https://orcid.org/0009-0005-4331-096X) - [Tibor Simko](https://orcid.org/0000-0001-7202-5803) - [Vladyslav Moisieienkov](https://orcid.org/0000-0001-9717-0775) diff --git a/Dockerfile b/Dockerfile index 5e59bc6..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/* @@ -72,5 +70,5 @@ LABEL org.opencontainers.image.title="reana-workflow-engine-serial" LABEL org.opencontainers.image.url="https://github.com/reanahub/reana-workflow-engine-serial" LABEL org.opencontainers.image.vendor="reanahub" # x-release-please-start-version -LABEL org.opencontainers.image.version="0.9.3" +LABEL org.opencontainers.image.version="0.95.0-alpha.1" # x-release-please-end diff --git a/reana_workflow_engine_serial/version.py b/reana_workflow_engine_serial/version.py index 56f035e..e52a4e5 100755 --- a/reana_workflow_engine_serial/version.py +++ b/reana_workflow_engine_serial/version.py @@ -14,4 +14,4 @@ from __future__ import absolute_import, print_function -__version__ = "0.9.3" +__version__ = "0.95.0a1" diff --git a/requirements.txt b/requirements.txt index a65ff0c..098d164 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,49 +1,55 @@ # -# 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 # 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 +arrow==1.3.0 # via isoduration +attrs==23.2.0 # via jsonschema, referencing 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 +fqdn==1.5.1 # via jsonschema 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 +isoduration==20.11.0 # via jsonschema +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 +jsonschema[format]==4.23.0 # via bravado-core, reana-commons, swagger-spec-validator +jsonschema-specifications==2023.12.1 # via jsonschema +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 arrow, 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.9.8 # via reana-workflow-engine-serial (setup.py) -requests==2.31.0 # via bravado, bravado-core +reana-commons==0.95.0a3 # via reana-workflow-engine-serial (setup.py) +referencing==0.35.1 # via jsonschema, jsonschema-specifications +requests==2.32.3 # via bravado, bravado-core +rfc3339-validator==0.1.4 # via jsonschema rfc3987==1.3.8 # via jsonschema +rpds-py==0.19.0 # via jsonschema, referencing 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 +six==1.16.0 # via bravado, bravado-core, fs, mock, python-dateutil, rfc3339-validator +swagger-spec-validator==3.0.4 # via bravado-core +types-python-dateutil==2.9.0.20240316 # via arrow +typing-extensions==4.12.2 # via bravado, swagger-spec-validator +uri-template==1.3.0 # via jsonschema +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 diff --git a/setup.py b/setup.py index dd6615c..3dfe156 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ history = open("CHANGELOG.md").read() tests_require = [ - "pytest-reana>=0.9.2,<0.10.0", + "pytest-reana>=0.95.0a2,<0.96.0", ] extras_require = { @@ -48,7 +48,7 @@ ] install_requires = [ - "reana-commons>=0.9.8,<0.10.0", + "reana-commons>=0.95.0a2,<0.96.0", ] packages = find_packages() @@ -79,6 +79,7 @@ "reana_workflow_engine_serial.tasks:run_serial_workflow", ] }, + python_requires=">=3.8", install_requires=install_requires, extras_require=extras_require, setup_requires=setup_requires,