diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index affb095..5b59abc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -82,6 +82,10 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Checkout uses: actions/checkout@v4 + - name: install uv + uses: astral-sh/setup-uv@v7 + with: + version: "0.10.4" - name: Build uses: ./.github/actions/build/python - name: Generate SDK diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 5048f8d..82e545b 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -63,12 +63,12 @@ jobs: uses: actions/checkout@v4 - name: Build uses: ./.github/actions/build/python - - name: Generate SDK - uses: ./.github/actions/generate-sdk/python - name: install uv uses: astral-sh/setup-uv@v7 with: version: "0.10.4" + - name: Generate SDK + uses: ./.github/actions/generate-sdk/python - name: Push SDK env: GH_REPO: "stackitcloud/stackit-sdk-python" diff --git a/languages/python/templates/pyproject.mustache b/languages/python/templates/pyproject.mustache index ad2819c..d68c572 100644 --- a/languages/python/templates/pyproject.mustache +++ b/languages/python/templates/pyproject.mustache @@ -48,7 +48,7 @@ dev = [ default-groups = "all" [tool.uv.sources] -stackit-core = { path = "../../stackit-core" } +stackit-core = { path = "../../core" } [tool.hatch.build.targets.sdist] include = ["src/stackit"] @@ -108,4 +108,4 @@ docstring-quotes = '"""' multiline-quotes = '"""' ban-relative-imports = true # Exclude generated code -extend-exclude = [ "src/stackit/*/models/*", "src/stackit/*/api/*", "src/stackit/*/*.py" ] \ No newline at end of file +extend-exclude = [ "src/stackit/*/models/*", "src/stackit/*/api/*", "src/stackit/*/*.py" ] diff --git a/scripts/generate-sdk/languages/python.sh b/scripts/generate-sdk/languages/python.sh index 59182e8..b4527dc 100644 --- a/scripts/generate-sdk/languages/python.sh +++ b/scripts/generate-sdk/languages/python.sh @@ -153,6 +153,8 @@ generate_python_sdk() { if [ -f "${sdk_services_backup_dir}/${service}/uv.lock" ]; then echo "Found ${service} \"uv.lock\" file" cp -r "${sdk_services_backup_dir}/${service}/uv.lock" "${SERVICES_FOLDER}/${service}/uv.lock" + else + uv lock --directory "${SERVICES_FOLDER}/${service}" fi # If the service has a CHANGELOG file, move it inside the service folder