Skip to content

Commit

Permalink
Update ACA-Py dependencies in the multitenant_provider plugin
Browse files Browse the repository at this point in the history
Signed-off-by: Wade Barnes <wade@neoterictech.ca>
  • Loading branch information
WadeBarnes committed Dec 4, 2023
1 parent fb2b583 commit 9b8054e
Show file tree
Hide file tree
Showing 7 changed files with 751 additions and 576 deletions.
6 changes: 3 additions & 3 deletions multitenant_provider/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/python-3/.devcontainer/base.Dockerfile
ARG VARIANT="3.9"
ARG VARIANT="3.9-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}

ARG POETRY_VERSION="1.4"
ARG POETRY_VERSION="1.4.2"
ENV POETRY_HOME="/opt/poetry" \
POETRY_VERSION=${POETRY_VERSION}

Expand All @@ -17,5 +17,5 @@ RUN curl -sSL https://install.python-poetry.org | python3 - \

COPY pyproject.toml poetry.lock ./
RUN poetry config virtualenvs.create false \
&& poetry install --no-root --no-interaction --with integration \
&& poetry install --no-root --no-interaction --with integration --extras "aca-py" \
&& rm -rf /root/.cache/pypoetry
2 changes: 1 addition & 1 deletion multitenant_provider/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN poetry config virtualenvs.in-project true
# Setup project
RUN mkdir multitenant_provider && touch multitenant_provider/__init__.py
COPY pyproject.toml poetry.lock README.md ./
ARG install_flags='--with integration'
ARG install_flags='--with integration --extras aca-py'
RUN poetry install ${install_flags}
USER $user

Expand Down
2 changes: 1 addition & 1 deletion multitenant_provider/integration/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
context: ..
dockerfile: docker/Dockerfile
args:
- install_flags=--no-interaction --with integration
- install_flags=--no-interaction --with integration --extras aca-py
command: start --arg-file integration.yml --label admin -e http://admin:3000 --log-level debug

tests:
Expand Down
336 changes: 179 additions & 157 deletions multitenant_provider/integration/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion multitenant_provider/integration/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = ""
authors = []

[tool.poetry.dependencies]
aries-cloudagent = { version = "0.10.3" }
aries-cloudagent = { version = ">=0.10.3, < 1.0.0" }
asynctest = "^0.13.0"
bcrypt = "^4.0.1"
mergedeep = "^1.3.4"
Expand Down
Loading

0 comments on commit 9b8054e

Please sign in to comment.