Skip to content

Commit

Permalink
Update ACA-Py dependencies (#49)
Browse files Browse the repository at this point in the history
* Update ACA-Py dependencies in the redis_events plugin

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Update ACA-Py dependencies for plugin_globals

- Make it easier to spin up the dev container environment.

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Update ACA-Py dependencies in the multitenant_provider plugin

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Update ACA-Py dependencies in the kafka_events plugin

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Update ACA-Py dependencies in the connection_update plugin

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Update ACA-Py dependencies in the basicmessage_storage plugin

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

* Switch to using BCovrin Test as the ledger for integration tests.

Signed-off-by: Wade Barnes <wade@neoterictech.ca>

---------

Signed-off-by: Wade Barnes <wade@neoterictech.ca>
  • Loading branch information
WadeBarnes authored Dec 5, 2023
1 parent dbf8042 commit d430101
Show file tree
Hide file tree
Showing 48 changed files with 3,238 additions and 2,384 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-linting-and-unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
id: changed-plugins
run: |
# Collects all the plugin names that have changes.
# Collects all the plugin names that have changes.
# If there is directory that isn't a plugin then it will need to skip it. Currently skipping plugin_globals
declare -a changed_dirs=()
for dir in ./*/; do
Expand All @@ -70,7 +70,7 @@ jobs:
run: |
for dir in ${{ steps.changed-plugins.outputs.changed-plugins }}; do
cd $dir
poetry install --no-interaction --no-root
poetry install --no-interaction --no-root --extras "aca-py"
cd ..
done
#----------------------------------------------
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ IMPORTANT: docker-in-docker can be a little flaky, so if you encounter a message

## Repo Management Script

A script was developed to help with maitenance of the repo called `repo_manager.py`. To run it you need a current version of poetry and python available.
Run `python repo_manager.py` and you will be met with 3 options.
- (1) Is used for starting or adding a new plugin. It will generate all the common scaffolding for a plugin which has the expected format.
- (2) Is used for updating and changing common poetry dependencies and configurations. It takes the poetry sections in the `pyproject.toml` files from the `plugin_globals` directory and combines them with the local plugin poetry sections. For the dependencies the common will be overridden by the globals. The other config sections will be replaced by the global configs. Then the lock files will be removed and re-installed.
A script was developed to help with maitenance of the repo called `repo_manager.py`. To run it you need a current version of poetry and python available.
Run `python repo_manager.py` and you will be met with 3 options.
- (1) Is used for starting or adding a new plugin. It will generate all the common scaffolding for a plugin which has the expected format.
- (2) Is used for updating and changing common poetry dependencies and configurations. It takes the poetry sections in the `pyproject.toml` files from the `plugin_globals` directory and combines them with the local plugin poetry sections. For the dependencies the common will be overridden by the globals. The other config sections will be replaced by the global configs. Then the lock files will be removed and re-installed.
- (3) Will take common development files like the `.devcontainer` directory from the globals and replace and tag the files. Using this you can make chages to every plugins development files from only editing them in one place.

IMPORTANT: This script processes the `pyproject.toml` sections by empty lines. Please do not have unnessecary empty lines between sections.
IMPORTANT: This script processes the `pyproject.toml` sections by empty lines. Please do not have unnessecary empty lines between sections.

## Plugin Documentation

The development team should describe what the plugin does, any limitations (ex only in multitenant mode), any known issues interacting with other plugins, etc. Full documentation including a plugin_config sample should be provided.
Expand Down Expand Up @@ -89,7 +89,7 @@ inbound-transport:
outbound-transport: http
endpoint: http://host.docker.internal:9060
genesis-url: https://indy.igrant.io/genesis
genesis-url: http://test.bcovrin.vonx.io/genesis
emit-new-didcomm-prefix: true
wallet-type: askar
Expand Down
6 changes: 3 additions & 3 deletions basicmessage_storage/.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 basicmessage_storage/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 basicmessage_storage && touch basicmessage_storage/__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 basicmessage_storage/docker/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ plugin:
- basicmessage_storage.v1_0

#config
genesis-url: https://indy.igrant.io/genesis
genesis-url: http://test.bcovrin.vonx.io/genesis

# Multi-tenancy
multitenant: true
Expand Down
2 changes: 1 addition & 1 deletion basicmessage_storage/docker/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugin:
- basicmessage_storage.v1_0

#config
genesis-url: https://indy.igrant.io/genesis
genesis-url: http://test.bcovrin.vonx.io/genesis

log-level: info

Expand Down
2 changes: 1 addition & 1 deletion basicmessage_storage/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 bob -e http://bob:3000 --log-level debug

alice:
Expand Down
Loading

0 comments on commit d430101

Please sign in to comment.