From ea9eb49981a98a55b27437a0cc3c9efc003e1ef9 Mon Sep 17 00:00:00 2001 From: gomezbc Date: Tue, 1 Apr 2025 11:05:40 +0200 Subject: [PATCH 1/5] chore: order alfabetically dependencies names --- ichub-backend/requirements.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ichub-backend/requirements.txt b/ichub-backend/requirements.txt index 01f4a4d1..d8d652f9 100644 --- a/ichub-backend/requirements.txt +++ b/ichub-backend/requirements.txt @@ -1,10 +1,6 @@ -Jinja2==3.1.6 -MarkupSafe==2.0.1 -PyYAML==6.0.2 -Pygments==2.19.1 -SQLAlchemy==2.0.38 annotated-types==0.7.0 anyio==4.8.0 +build==1.2.2.post1 certifi==2023.7.22 cffi==1.17.1 charset-normalizer==3.4.1 @@ -14,9 +10,9 @@ deprecation==2.1.0 dnspython==2.7.0 email_validator==2.2.0 exceptiongroup==1.2.2 +fastapi==0.115.7 fastapi-cli==0.0.7 fastapi-keycloak-middleware==1.1.0 -fastapi==0.115.7 greenlet==3.1.1 h11==0.14.0 httpcore==0.16.3 @@ -24,26 +20,33 @@ httptools==0.6.4 httpx==0.23.1 idna==3.3 iniconfig==2.0.0 +Jinja2==3.1.4 jwcrypto==1.5.6 markdown-it-py==3.0.0 +MarkupSafe==2.0.1 mdurl==0.1.2 packaging==24.1 pluggy==1.5.0 pycparser==2.22 pydantic==2.6.3 pydantic_core==2.16.3 -pytest-asyncio==0.15.1 +Pygments==2.19.1 +pyproject_hooks==1.2.0 pytest==8.1.1 +pytest-asyncio==0.15.1 python-dotenv==1.0.1 python-keycloak==4.0.1 python-multipart==0.0.20 -requests-toolbelt==1.0.0 +PyYAML==6.0.2 requests==2.32.3 +requests-toolbelt==1.0.0 rfc3986==1.5.0 -rich-toolkit==0.13.2 rich==13.9.4 +rich-toolkit==0.13.2 +setuptools==75.8.2 shellingham==1.5.4 sniffio==1.3.1 +SQLAlchemy==2.0.38 sqlmodel==0.0.22 starlette==0.40.0 tomli==2.0.1 From 17049c3ec9cf21f5ab5576db777789250f76855a Mon Sep 17 00:00:00 2001 From: gomezbc Date: Tue, 1 Apr 2025 11:21:01 +0200 Subject: [PATCH 2/5] feat: add tructusx_sdk dependency from GitHub repository --- DEPENDENCIES_ICHUB-BACKEND | 3 +++ ichub-backend/requirements.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/DEPENDENCIES_ICHUB-BACKEND b/DEPENDENCIES_ICHUB-BACKEND index 8424dd2c..6fa81c17 100644 --- a/DEPENDENCIES_ICHUB-BACKEND +++ b/DEPENDENCIES_ICHUB-BACKEND @@ -5,6 +5,7 @@ pypi/pypi/-/Pygments/2.19.1, , approved, #19382 pypi/pypi/-/SQLAlchemy/2.0.38, MIT AND LGPL-2.0-only AND BSD-3-Clause AND LGPL-2.0-or-later, approved, #19392 pypi/pypi/-/annotated-types/0.7.0, MIT, approved, clearlydefined pypi/pypi/-/anyio/4.8.0, MIT, approved, #19384 +pypi/pypi/-/build/1.2.2.post1, MIT, approved, clearlydefined pypi/pypi/-/certifi/2023.7.22, MPL-2.0, approved, #19826 pypi/pypi/-/cffi/1.17.1, MIT, approved, #19388 pypi/pypi/-/charset-normalizer/3.4.1, MIT AND (LGPL-2.1-only AND MIT) AND LGPL-2.1-only AND CC-BY-SA-3.0, approved, #19391 @@ -32,6 +33,7 @@ pypi/pypi/-/pluggy/1.5.0, MIT, approved, clearlydefined pypi/pypi/-/pycparser/2.22, LGPL-2.0-or-later AND BSD-3-Clause, approved, #14636 pypi/pypi/-/pydantic/2.6.3, MIT, approved, #13069 pypi/pypi/-/pydantic_core/2.16.3, MIT, approved, clearlydefined +pypi/pypi/-/pyproject_hooks/1.2.0, MIT, approved, clearlydefined pypi/pypi/-/pytest-asyncio/0.15.1, Apache-2.0, approved, clearlydefined pypi/pypi/-/pytest/8.1.1, MIT, approved, #19365 pypi/pypi/-/python-dotenv/1.0.1, BSD-2-Clause AND BSD-3-Clause, approved, clearlydefined @@ -47,6 +49,7 @@ pypi/pypi/-/sniffio/1.3.1, Apache-2.0 OR (Apache-2.0 AND MIT), approved, clearly pypi/pypi/-/sqlmodel/0.0.22, MIT, approved, clearlydefined pypi/pypi/-/starlette/0.40.0, BSD-2-Clause AND BSD-3-Clause, approved, clearlydefined pypi/pypi/-/tomli/2.0.1, MIT, approved, #7824 +pypi/pypi/-/tractusx_sdk/0.0.1, Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-generic-export-compliance, restricted, clearlydefined pypi/pypi/-/typer/0.15.1, MIT, approved, clearlydefined pypi/pypi/-/typing_extensions/4.12.2, Python-2.0, approved, #19383 pypi/pypi/-/urllib3/2.3.0, MIT AND Python-2.0 AND MPL-2.0, approved, #19863 diff --git a/ichub-backend/requirements.txt b/ichub-backend/requirements.txt index d8d652f9..2796fcf7 100644 --- a/ichub-backend/requirements.txt +++ b/ichub-backend/requirements.txt @@ -50,6 +50,7 @@ SQLAlchemy==2.0.38 sqlmodel==0.0.22 starlette==0.40.0 tomli==2.0.1 +tractusx_sdk @ git+https://github.com/eclipse-tractusx/tractusx-sdk.git@07570bf2f345ae9c359a67ab4d1b8e154711d7ac typer==0.15.1 typing_extensions==4.12.2 urllib3==2.3.0 From 72315c589fbc8a95bae20d1bc2552c8a63003e80 Mon Sep 17 00:00:00 2001 From: gomezbc Date: Tue, 1 Apr 2025 11:23:04 +0200 Subject: [PATCH 3/5] chore: update versions of python to 3.12 for installing sdk --- .github/workflows/dependencies-backend.yml | 2 +- ichub-backend/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependencies-backend.yml b/.github/workflows/dependencies-backend.yml index 0cd9a770..d0391ee2 100644 --- a/.github/workflows/dependencies-backend.yml +++ b/.github/workflows/dependencies-backend.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Python uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0 with: - python-version: '3.10' + python-version: '3.12' - name: Create and activate virtual environment run: | diff --git a/ichub-backend/Dockerfile b/ichub-backend/Dockerfile index 1201eb2d..3594aba5 100644 --- a/ichub-backend/Dockerfile +++ b/ichub-backend/Dockerfile @@ -21,7 +21,7 @@ ################################################################################# -FROM alpine:3.19 +FROM alpine:3.21 USER root @@ -34,7 +34,7 @@ WORKDIR /dataspace-sdk RUN ls -la ## Install Python -RUN apk add python3 py3-pip libpq --no-cache +RUN apk add python3 py3-pip libpq git --no-cache ## Install application requirements RUN pip3 install --break-system-packages --no-cache-dir --upgrade -r ./requirements.txt From 834198d90eeab58621df782cafc0858c81fb93c0 Mon Sep 17 00:00:00 2001 From: gomezbc Date: Tue, 8 Apr 2025 11:28:46 +0200 Subject: [PATCH 4/5] fix: remove git from Dockerfile and set tractusx_sdk to 0.0.2 --- DEPENDENCIES_ICHUB-BACKEND | 2 +- ichub-backend/Dockerfile | 4 ++-- ichub-backend/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPENDENCIES_ICHUB-BACKEND b/DEPENDENCIES_ICHUB-BACKEND index 6fa81c17..8635da2c 100644 --- a/DEPENDENCIES_ICHUB-BACKEND +++ b/DEPENDENCIES_ICHUB-BACKEND @@ -49,7 +49,7 @@ pypi/pypi/-/sniffio/1.3.1, Apache-2.0 OR (Apache-2.0 AND MIT), approved, clearly pypi/pypi/-/sqlmodel/0.0.22, MIT, approved, clearlydefined pypi/pypi/-/starlette/0.40.0, BSD-2-Clause AND BSD-3-Clause, approved, clearlydefined pypi/pypi/-/tomli/2.0.1, MIT, approved, #7824 -pypi/pypi/-/tractusx_sdk/0.0.1, Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-generic-export-compliance, restricted, clearlydefined +pypi/pypi/-/tractusx_sdk/0.0.2, , restricted, clearlydefined pypi/pypi/-/typer/0.15.1, MIT, approved, clearlydefined pypi/pypi/-/typing_extensions/4.12.2, Python-2.0, approved, #19383 pypi/pypi/-/urllib3/2.3.0, MIT AND Python-2.0 AND MPL-2.0, approved, #19863 diff --git a/ichub-backend/Dockerfile b/ichub-backend/Dockerfile index 3594aba5..545e3062 100644 --- a/ichub-backend/Dockerfile +++ b/ichub-backend/Dockerfile @@ -34,10 +34,10 @@ WORKDIR /dataspace-sdk RUN ls -la ## Install Python -RUN apk add python3 py3-pip libpq git --no-cache +RUN apk add python3 py3-pip libpq --no-cache ## Install application requirements -RUN pip3 install --break-system-packages --no-cache-dir --upgrade -r ./requirements.txt +RUN pip3 install --break-system-packages --no-cache-dir -r ./requirements.txt ## Create user groups RUN addgroup -g 3000 appgroup \ diff --git a/ichub-backend/requirements.txt b/ichub-backend/requirements.txt index 2796fcf7..30187501 100644 --- a/ichub-backend/requirements.txt +++ b/ichub-backend/requirements.txt @@ -50,7 +50,7 @@ SQLAlchemy==2.0.38 sqlmodel==0.0.22 starlette==0.40.0 tomli==2.0.1 -tractusx_sdk @ git+https://github.com/eclipse-tractusx/tractusx-sdk.git@07570bf2f345ae9c359a67ab4d1b8e154711d7ac +tractusx_sdk==0.0.2 typer==0.15.1 typing_extensions==4.12.2 urllib3==2.3.0 From fe21c65554eba68c5db8aa443b194d3d362500fd Mon Sep 17 00:00:00 2001 From: gomezbc Date: Tue, 8 Apr 2025 16:45:01 +0200 Subject: [PATCH 5/5] fix: update tractusx_sdk license information to approved status --- DEPENDENCIES_ICHUB-BACKEND | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES_ICHUB-BACKEND b/DEPENDENCIES_ICHUB-BACKEND index 8635da2c..cbdca87b 100644 --- a/DEPENDENCIES_ICHUB-BACKEND +++ b/DEPENDENCIES_ICHUB-BACKEND @@ -49,7 +49,7 @@ pypi/pypi/-/sniffio/1.3.1, Apache-2.0 OR (Apache-2.0 AND MIT), approved, clearly pypi/pypi/-/sqlmodel/0.0.22, MIT, approved, clearlydefined pypi/pypi/-/starlette/0.40.0, BSD-2-Clause AND BSD-3-Clause, approved, clearlydefined pypi/pypi/-/tomli/2.0.1, MIT, approved, #7824 -pypi/pypi/-/tractusx_sdk/0.0.2, , restricted, clearlydefined +pypi/pypi/-/tractusx_sdk/0.0.2, Apache-2.0 AND CC-BY-4.0, approved, #20505 pypi/pypi/-/typer/0.15.1, MIT, approved, clearlydefined pypi/pypi/-/typing_extensions/4.12.2, Python-2.0, approved, #19383 pypi/pypi/-/urllib3/2.3.0, MIT AND Python-2.0 AND MPL-2.0, approved, #19863