Merge pull request #31 from Project-OMOTES/30-fix-missing-conversion-…

…from-jsonformat-values-to-params_dict-values 30 fix missing conversion from jsonformat values to params dict values
Project-OMOTES · Sep 19, 2024 · 9800d5f · 9800d5f
2 parents ad1399f + d4f0415
commit 9800d5f
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 91 deletions.
diff --git 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.12" ]
     name: Setup
     steps:
       - uses: actions/checkout@v3
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.11" ]
+        python-version: [ "3.12" ]
     steps:
     - uses: actions/checkout@v3
     - name: Restore venv
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.11" ]
+        python-version: [ "3.12" ]
     steps:
     - uses: actions/checkout@v3
     - name: Restore venv
@@ -98,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.11" ]
+        python-version: [ "3.12" ]
     steps:
     - uses: actions/checkout@v3
     - name: Restore venv

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 
 WORKDIR /app
 

diff --git a/ci/linux/create_venv.sh b/ci/linux/create_venv.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
-python3.11 -m venv ./.venv
+python3.12 -m venv ./.venv
 . .venv/bin/activate
 pip3 install pip-tools
diff --git a/ci/linux/update_dependencies.sh b/ci/linux/update_dependencies.sh
@@ -4,5 +4,5 @@ if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
   . .venv/bin/activate
 fi
 
-pip-compile --output-file=requirements.txt pyproject.toml
-pip-compile --extra=dev -c requirements.txt --output-file=dev-requirements.txt pyproject.toml
+pip-compile -U --output-file=requirements.txt pyproject.toml
+pip-compile -U --extra=dev -c requirements.txt --output-file=dev-requirements.txt pyproject.toml
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,22 +1,22 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt pyproject.toml
 #
-aio-pika==9.4.2
+aio-pika==9.4.3
     # via
     #   -c requirements.txt
     #   omotes-sdk-python
-aiormq==6.8.0
+aiormq==6.8.1
     # via
     #   -c requirements.txt
     #   aio-pika
 amqp==5.2.0
     # via
     #   -c requirements.txt
     #   kombu
-apispec[marshmallow]==6.3.0
+apispec[marshmallow]==6.6.1
     # via
     #   -c requirements.txt
     #   flask-smorest
@@ -26,7 +26,7 @@ billiard==4.2.0
     #   celery
 black==22.1.0
     # via omotes-rest (pyproject.toml)
-blinker==1.6.2
+blinker==1.8.2
     # via
     #   -c requirements.txt
     #   flask
@@ -45,7 +45,7 @@ click==8.1.7
     #   click-plugins
     #   click-repl
     #   flask
-click-didyoumean==0.3.0
+click-didyoumean==0.3.1
     # via
     #   -c requirements.txt
     #   celery
@@ -61,11 +61,9 @@ colorama==0.4.6
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-coverage[toml]==7.4.4
+coverage[toml]==7.6.1
     # via pytest-cov
-exceptiongroup==1.2.1
-    # via pytest
-flake8==6.0.0
+flake8==6.1.0
     # via
     #   flake8-docstrings
     #   flake8-pyproject
@@ -75,7 +73,7 @@ flake8-docstrings==1.7.0
     # via omotes-rest (pyproject.toml)
 flake8-pyproject==1.2.3
     # via omotes-rest (pyproject.toml)
-flake8-quotes==3.3.2
+flake8-quotes==3.4.0
     # via omotes-rest (pyproject.toml)
 flask==2.3.3
     # via
@@ -85,50 +83,50 @@ flask==2.3.3
     #   flask-smorest
     #   omotes-rest (pyproject.toml)
     #   types-flask-cors
-flask-cors==4.0.0
+flask-cors==4.0.2
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
 flask-dotenv==0.1.2
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-flask-smorest==0.42.1
+flask-smorest==0.42.3
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-greenlet==2.0.2
+greenlet==3.1.0
     # via
     #   -c requirements.txt
     #   sqlalchemy
 gunicorn==21.2.0
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-idna==3.6
+idna==3.10
     # via
     #   -c requirements.txt
     #   yarl
 iniconfig==2.0.0
     # via pytest
-itsdangerous==2.1.2
+itsdangerous==2.2.0
     # via
     #   -c requirements.txt
     #   flask
-jinja2==3.1.2
+jinja2==3.1.4
     # via
     #   -c requirements.txt
     #   flask
-kombu==5.3.5
+kombu==5.4.2
     # via
     #   -c requirements.txt
     #   celery
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via
     #   -c requirements.txt
     #   jinja2
     #   werkzeug
-marshmallow==3.20.1
+marshmallow==3.20.2
     # via
     #   -c requirements.txt
     #   apispec
@@ -147,7 +145,7 @@ marshmallow-enum==1.5.1
     #   omotes-rest (pyproject.toml)
 mccabe==0.7.0
     # via flake8
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   -c requirements.txt
     #   yarl
@@ -169,7 +167,7 @@ omotes-sdk-python==3.1.2
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-packaging==23.1
+packaging==24.1
     # via
     #   -c requirements.txt
     #   apispec
@@ -186,29 +184,29 @@ pamqp==3.3.0
     #   omotes-sdk-python
 pathspec==0.12.1
     # via black
-platformdirs==4.2.0
+platformdirs==4.3.6
     # via black
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.47
     # via
     #   -c requirements.txt
     #   click-repl
-protobuf==4.25.3
+protobuf==4.25.5
     # via
     #   -c requirements.txt
     #   omotes-sdk-protocol
-psycopg2-binary==2.9.3
+psycopg2-binary==2.9.9
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-pycodestyle==2.10.0
+pycodestyle==2.11.1
     # via flake8
 pydocstyle==6.3.0
     # via flake8-docstrings
-pyflakes==3.0.1
+pyflakes==3.1.0
     # via flake8
-pyproject-hooks==1.0.0
+pyproject-hooks==1.1.0
     # via build
 pytest==7.3.2
     # via
@@ -220,7 +218,7 @@ python-dateutil==2.9.0.post0
     # via
     #   -c requirements.txt
     #   celery
-python-dotenv==1.0.0
+python-dotenv==1.0.1
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
@@ -244,25 +242,15 @@ structlog==23.1.0
     # via
     #   -c requirements.txt
     #   omotes-rest (pyproject.toml)
-toml==0.10.2
-    # via setuptools-git-versioning
 tomli==2.0.1
-    # via
-    #   black
-    #   build
-    #   coverage
-    #   flake8-pyproject
-    #   mypy
-    #   pyproject-hooks
-    #   pytest
-types-flask-cors==4.0.0.20240405
+    # via black
+types-flask-cors==5.0.0.20240902
     # via omotes-rest (pyproject.toml)
-types-protobuf==4.24.0.20240311
+types-protobuf==4.24.0.20240408
     # via omotes-rest (pyproject.toml)
 typing-extensions==4.11.0
     # via
     #   -c requirements.txt
-    #   marshmallow-dataclass
     #   mypy
     #   omotes-sdk-python
     #   sqlalchemy
@@ -275,6 +263,7 @@ tzdata==2024.1
     # via
     #   -c requirements.txt
     #   celery
+    #   kombu
 vine==5.1.0
     # via
     #   -c requirements.txt
@@ -285,16 +274,16 @@ wcwidth==0.2.13
     # via
     #   -c requirements.txt
     #   prompt-toolkit
-webargs==8.3.0
+webargs==8.6.0
     # via
     #   -c requirements.txt
     #   flask-smorest
-werkzeug==2.3.7
+werkzeug==3.0.4
     # via
     #   -c requirements.txt
     #   flask
     #   flask-smorest
-yarl==1.9.4
+yarl==1.11.1
     # via
     #   -c requirements.txt
     #   aio-pika

diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 
 WORKDIR /app
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,6 @@ dependencies = [
     "Flask-Cors ~= 4.0.0",
     "Flask-DotEnv ~= 0.1.2",
     "flask-smorest ~= 0.42.0",
-    "psycopg2-binary==2.9.3",
     "gunicorn ~= 21.2.0",
     "marshmallow ~= 3.20.1",
     "marshmallow-dataclass ~= 8.5.14",
@@ -44,10 +43,10 @@ dependencies = [
 dev = [
     #"pip-tools~=6.13.0",  # Installed via create_env script
     "black ~= 22.1.0",
-    "flake8 ~= 6.0.0",
-    "Flake8-pyproject ~= 1.2.3",
-    "flake8-docstrings ~= 1.7.0",
-    "flake8-quotes ~= 3.3.2",
+    "flake8 ~= 6.0",
+    "Flake8-pyproject ~= 1.2",
+    "flake8-docstrings ~= 1.7",
+    "flake8-quotes ~= 3.3",
     "pytest ~= 7.3.1",
     "pytest-cov ~= 4.0.0",
     "mypy ~= 1.5.1",