Skip to content
Merged
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
3 changes: 1 addition & 2 deletions .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ jobs:
with:
working-directory: ${{ github.workspace }}/jans-cedarling/bindings/cedarling_python
command: build
args: --release -i python3.10 python3.11
args: --release -i python3.11

- name: Sign and upload Cedarling Python wheels
id: sign-cedarling
Expand All @@ -560,7 +560,6 @@ jobs:

cd ${{ github.workspace }}/jans-cedarling/target/wheels
gpg --armor --detach-sign cedarling_python-"${TAG}"-cp311-cp311-manylinux_2_34_x86_64.whl || echo "Failed to sign"
gpg --armor --detach-sign cedarling_python-"${TAG}"-cp310-cp310-manylinux_2_34_x86_64.whl || echo "Failed to sign"
echo "${{ secrets.MOAUTO_WORKFLOW_TOKEN }}" | gh auth login --with-token
gh release upload "${VERSION}" *.whl *.asc

Expand Down
6 changes: 3 additions & 3 deletions jans-cedarling/flask-sidecar/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.16-slim-bookworm@sha256:5fb1a18941b20a1be253974bf5ad9e63c9e251279856649b356178962e8908a2
FROM python:3.11.14-slim-trixie@sha256:8ef21a26e7c342e978a68cf2d6b07627885930530064f572f432ea422a8c0907
# ===============
# Debian packages
# ===============
Expand Down Expand Up @@ -54,15 +54,15 @@ RUN git clone --filter blob:none --no-checkout https://github.com/JanssenProject
&& echo "${version}" > /api/cedarling_version \
&& release_version="v${version}" \
&& if [ "$version" = "0.0.0" ]; then release_version="nightly"; fi \
&& wget -q https://github.com/JanssenProject/jans/releases/download/"${release_version}"/cedarling_python-"${version}"-cp310-cp310-manylinux_2_34_x86_64.whl -O /api/cedarling_python-"${version}"-cp310-cp310-manylinux_2_34_x86_64.whl \
&& wget -q https://github.com/JanssenProject/jans/releases/download/"${release_version}"/cedarling_python-"${version}"-cp311-cp311-manylinux_2_34_x86_64.whl -O /api/cedarling_python-"${version}"-cp311-cp311-manylinux_2_34_x86_64.whl \
&& rm -rf /tmp/jans

# Setting up proper permissions:
RUN chmod -R g=u /api \
&& chown -R 1000:1000 /api

# Project initialization:
RUN poetry add /api/cedarling_python-$(cat /api/cedarling_version)-cp310-cp310-manylinux_2_34_x86_64.whl \
RUN poetry add /api/cedarling_python-"$(cat /api/cedarling_version)"-cp311-cp311-manylinux_2_34_x86_64.whl \
&& poetry install --no-dev --no-root --no-interaction --no-ansi \
# Cleaning poetry installation's cache for production:
&& rm -rf "$POETRY_CACHE_DIR"
Expand Down
71 changes: 2 additions & 69 deletions jans-cedarling/flask-sidecar/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jans-cedarling/flask-sidecar/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "README.md"
packages = [{ include = "main" }]

[tool.poetry.dependencies]
python = "^3.10"
python = "^3.11"
flask = "^3.1.1"
flask-smorest = "^0.45.0"
pyyaml = "^6.0.2"
Expand Down
4 changes: 2 additions & 2 deletions jans-cedarling/flask-sidecar/tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py310
envlist = py311
skip_missing_interpreters = true
# align with pyproject.toml
isolated_build = true
Expand All @@ -17,4 +17,4 @@ commands_pre =
poetry install
commands =
poetry install -v
poetry run pytest -v --cov-config=.coveragerc --cov=main --cov-report=term-missing:skip-covered --cov-report=xml tests/
poetry run pytest -v --cov-config=.coveragerc --cov=main --cov-report=term-missing:skip-covered --cov-report=xml tests/
Loading