diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3018eb4..4f7b052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.13" ] name: Setup steps: - uses: actions/checkout@v3 @@ -37,11 +37,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.13" ] steps: - uses: actions/checkout@v3 with: submodules: 'recursive' + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: @@ -59,11 +64,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.13" ] steps: - uses: actions/checkout@v3 with: submodules: 'recursive' + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: run integration tests run: | cd integration_test @@ -76,11 +86,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.13" ] steps: - uses: actions/checkout@v3 with: submodules: 'recursive' + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: @@ -121,11 +136,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.13" ] steps: - uses: actions/checkout@v3 with: submodules: 'recursive' + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Restore venv uses: actions/download-artifact@v4 with: diff --git a/Dockerfile b/Dockerfile index 53c4bca..5901ad5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim-buster +FROM python:3.13-slim WORKDIR /app diff --git a/ci/linux/create_venv.sh b/ci/linux/create_venv.sh index e2a60fa..1a82bd7 100755 --- a/ci/linux/create_venv.sh +++ b/ci/linux/create_venv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -python3.11 -m venv ./.venv +python3.13 -m venv ./.venv if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then echo "Activating .venv first." . .venv/bin/activate diff --git a/ci/linux/lint.sh b/ci/linux/lint.sh index 42f08eb..e07473e 100755 --- a/ci/linux/lint.sh +++ b/ci/linux/lint.sh @@ -1,8 +1,24 @@ #!/usr/bin/env bash +which python +which python3 +ls -alh . +echo $PWD +python --version +python3 --version + if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then echo "Activating .venv first." . .venv/bin/activate + echo .venv/bin/activate fi + +which python +which python3 +ls -alh . +echo $PWD +python --version +python3 --version + flake8 ./src/omotes_orchestrator ./unit_test/ diff --git a/dev-requirements.txt b/dev-requirements.txt index 6b3a819..3954f0f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt pyproject.toml @@ -12,7 +12,7 @@ aiormq==6.8.1 # via # -c requirements.txt # aio-pika -alembic==1.13.3 +alembic==1.14.0 # via # -c requirements.txt # orchestrator (pyproject.toml) @@ -20,7 +20,7 @@ amqp==5.3.1 # via # -c requirements.txt # kombu -attrs==24.2.0 +attrs==24.3.0 # via flake8-bugbear billiard==4.2.1 # via @@ -35,7 +35,7 @@ celery==5.3.6 # -c requirements.txt # omotes-sdk-python # orchestrator (pyproject.toml) -click==8.1.7 +click==8.1.8 # via # -c requirements.txt # black @@ -55,7 +55,7 @@ click-repl==0.3.0 # via # -c requirements.txt # celery -coverage[toml]==7.6.9 +coverage[toml]==7.6.10 # via pytest-cov dataclass-binder==0.3.4 # via @@ -85,10 +85,6 @@ future-fstrings==1.2.0 # via # -c requirements.txt # pyecore -greenlet==3.1.1 - # via - # -c requirements.txt - # sqlalchemy idna==3.10 # via # -c requirements.txt diff --git a/dev.Dockerfile b/dev.Dockerfile index 25d8bb5..6c3a13d 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim-buster +FROM python:3.13-slim WORKDIR /app diff --git a/integration_test/integration_tests/Dockerfile b/integration_test/integration_tests/Dockerfile index a7f5ed2..54ade7c 100644 --- a/integration_test/integration_tests/Dockerfile +++ b/integration_test/integration_tests/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim +FROM python:3.13-slim WORKDIR /app diff --git a/integration_test/test_worker/Dockerfile b/integration_test/test_worker/Dockerfile index 98c6415..14a2316 100644 --- a/integration_test/test_worker/Dockerfile +++ b/integration_test/test_worker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim +FROM python:3.13-slim WORKDIR /app diff --git a/pyproject.toml b/pyproject.toml index 8a12467..de9f1f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ description = "Orchestrator component of OMOTES project which monitors workflows classifiers = [ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.13", "Operating System :: OS Independent", "Development Status :: 4 - Beta", "Intended Audience :: Developers", @@ -21,16 +21,16 @@ classifiers = [ ] readme = "README.md" license = {file = "LICENSE"} -requires-python = ">=3.10" +requires-python = ">=3.13" dependencies = [ - "python-dotenv ~= 1.0.0", + "python-dotenv ~= 1.0.1", "dataclass-binder ~= 0.3.4", - "sqlalchemy ~= 2.0.27", - "psycopg2-binary ~= 2.9.9", + "sqlalchemy ~= 2.0.36", + "psycopg2-binary ~= 2.9.10", "celery ~= 5.3.6", "omotes-sdk-python ~= 3.2.5", - "alembic ~= 1.13.1", + "alembic ~= 1.14.0", ] [project.optional-dependencies] @@ -105,7 +105,7 @@ count = true line-length = 100 [tool.mypy] -python_version = "3.11" +python_version = "3.13" warn_return_any = true warn_unused_configs = true disallow_untyped_defs = true diff --git a/requirements.txt b/requirements.txt index c865a34..48d39c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # pip-compile --output-file=requirements.txt pyproject.toml @@ -8,7 +8,7 @@ aio-pika==9.4.3 # via omotes-sdk-python aiormq==6.8.1 # via aio-pika -alembic==1.13.3 +alembic==1.14.0 # via orchestrator (pyproject.toml) amqp==5.3.1 # via kombu @@ -18,7 +18,7 @@ celery==5.3.6 # via # omotes-sdk-python # orchestrator (pyproject.toml) -click==8.1.7 +click==8.1.8 # via # celery # click-didyoumean @@ -34,8 +34,6 @@ dataclass-binder==0.3.4 # via orchestrator (pyproject.toml) future-fstrings==1.2.0 # via pyecore -greenlet==3.1.1 - # via sqlalchemy idna==3.10 # via yarl kombu==5.4.2