Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

87: Upgrade required python to 3.13 and update dependencies #88

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim-buster
FROM python:3.13-slim

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion ci/linux/create_venv.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 16 additions & 0 deletions ci/linux/lint.sh
Original file line number Diff line number Diff line change
@@ -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/
14 changes: 5 additions & 9 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,15 +12,15 @@ 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)
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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim-buster
FROM python:3.13-slim

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion integration_test/integration_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.13-slim

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion integration_test/test_worker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.13-slim

WORKDIR /app

Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[project]

Check failure on line 1 in pyproject.toml

View workflow job for this annotation

GitHub Actions / Typecheck (3.13)

error: Error importing plugin "sqlalchemy.ext.mypy.plugin": attribute '__default__' of 'typing.ParamSpec' objects is not writable [misc]
name = "orchestrator"
dynamic = ["version"]
authors = [
Expand All @@ -9,7 +9,7 @@
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",
Expand All @@ -21,16 +21,16 @@
]
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]
Expand Down Expand Up @@ -105,7 +105,7 @@
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
Expand Down
8 changes: 3 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading