Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from hyperledger:main #177

Merged
merged 93 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
18b9062
fix: rework stored conn record schema
dbluhm Jan 30, 2024
6ff821c
chore: regenerate openapi
dbluhm Jan 30, 2024
595a9b0
style: formatting according to black@24.1.1
dbluhm Jan 30, 2024
dbe1198
Merge pull request #2746 from dbluhm/fix/connrecord-schema-name
swcurran Feb 13, 2024
bed6e11
:recycle: Replace deprecated `pkg_resources` with `importlib`
ff137 Feb 2, 2024
3bc3735
:recycle: Refactor tests to accommodate for pkg_resources being repla…
ff137 Feb 2, 2024
3f05059
:art: remove unused import
ff137 Feb 2, 2024
52e671b
:art: remove the return type
ff137 Feb 2, 2024
3f74fad
:art: fix test
ff137 Feb 2, 2024
fc9894d
:art:
ff137 Feb 2, 2024
af87e1e
:art: Fix Marshmallow deprecation warnings by introducing metadata field
ff137 Feb 2, 2024
b6ff481
:arrow_up: Upgrade `jsonpath-ng`
ff137 Feb 2, 2024
1a49a0e
Update lock file
ff137 Feb 2, 2024
c73527d
:arrow_up: Bump `rlp` to latest
ff137 Feb 2, 2024
c8386ec
Update lock file
ff137 Feb 2, 2024
adcd45b
:art: Fix Marshmallow deprecation warnings with metadata field
ff137 Feb 2, 2024
a865df7
:art: `send_webhook` tests to expect and absorb deprecation warning
ff137 Feb 2, 2024
d1d276b
:arrow_up: Upgrade `Markdown` to latest
ff137 Feb 2, 2024
b8a8e68
Update lock file
ff137 Feb 2, 2024
97640e1
:art: replace usage of deprecated .warn method with .warning
ff137 Feb 7, 2024
492acd3
:art: set test scope to module level
ff137 Feb 7, 2024
71ebce7
:art: set test scope to module level
ff137 Feb 7, 2024
58f9490
:art: fix metadata containing required field
ff137 Feb 12, 2024
4df2984
:art: fix marshmallow warning
ff137 Feb 12, 2024
dfd829d
:art: ignore specific warnings from external packages
ff137 Feb 12, 2024
052530a
Add Dependabot configuration
WadeBarnes Feb 14, 2024
41e3bdc
Merge pull request #2783 from WadeBarnes/add-dependabot-config
swcurran Feb 14, 2024
5185c35
chore(deps): Bump the all-actions group with 10 updates
dependabot[bot] Feb 14, 2024
7cc449a
Merge pull request #2784 from hyperledger/dependabot/github_actions/a…
swcurran Feb 14, 2024
dc63049
Add Dependabot configuration
WadeBarnes Feb 14, 2024
8eceb59
chore(deps): Bump the all-actions group with 10 updates
dependabot[bot] Feb 14, 2024
6cc9790
Merge branch 'main' into fix-deprecation-warnings
swcurran Feb 14, 2024
eaee031
Anoncreds revoke and publish-revocations endorsement (#2782)
jamshale Feb 14, 2024
415b766
Demo description of reuse in establishing a connection
swcurran Feb 14, 2024
75c52c3
Merge branch 'main' into reuse-demo
ianco Feb 15, 2024
a7c022a
Merge pull request #2787 from swcurran/reuse-demo
ianco Feb 15, 2024
a4af72a
Add known issues section to Multiledger.md documentation
esune Feb 15, 2024
16819d9
Revert profile inject
jamshale Feb 15, 2024
c605494
Revert VcLdpManager as plugable usage
jamshale Feb 15, 2024
30543a1
Fix unit tests
jamshale Feb 15, 2024
afae3db
Merge branch 'main' into fix-deprecation-warnings
ff137 Feb 16, 2024
a6acbc3
Merge pull request #2789 from jamshale/revert-inject-profile
swcurran Feb 16, 2024
a2809c8
feat: emit did peer per tenant setting
amanji Feb 16, 2024
1a8c6d1
feat: preserve exchange records per tenant setting
amanji Feb 16, 2024
7fe2f8f
feat: requests through public did per tenant setting
amanji Feb 16, 2024
142eb5d
Merge branch 'main' into feature/per-tenant-settings
amanji Feb 16, 2024
46316a3
Merge branch 'main' into chore/update-multiledger-docs
ianco Feb 16, 2024
9b24f4c
version updated to latest release
PatStLouis Feb 16, 2024
84c62ce
revert profile injection for ldpmanager
PatStLouis Feb 16, 2024
fc44be1
Merge pull request #2794 from OpSecId/pstlouis/replace-profile-inject…
swcurran Feb 16, 2024
057a5b0
Merge branch 'main' into chore/update-multiledger-docs
esune Feb 16, 2024
b8508cc
Merge branch 'main' into pstlouis/bump-pyld
PatStLouis Feb 16, 2024
a6518a9
Merge branch 'main' into feature/per-tenant-settings
swcurran Feb 16, 2024
6401d8c
change middleware registration order
PatStLouis Feb 16, 2024
5f4858a
lint me alone!
PatStLouis Feb 16, 2024
2f92b4d
shorten comment
PatStLouis Feb 16, 2024
9a3ec90
linting again...
PatStLouis Feb 17, 2024
a36094e
Merge pull request #2790 from petridishdev/feature/per-tenant-settings
swcurran Feb 17, 2024
5b24588
Merge branch 'main' into chore/update-multiledger-docs
swcurran Feb 17, 2024
54ce86a
0.12.0rc1
swcurran Feb 17, 2024
afd0c6b
Merge branch 'main' into 0.12.0rc1
swcurran Feb 17, 2024
b5fe271
Update PR number for this PR
swcurran Feb 17, 2024
bac25e4
Merge remote-tracking branch 'origin/0.12.0rc1' into 0.12.0rc1
swcurran Feb 17, 2024
4ae1714
Merge branch 'hyperledger:main' into pstlouis/change-validation-middl…
PatStLouis Feb 17, 2024
f77019c
Merge branch 'main' into fix-deprecation-warnings
ff137 Feb 17, 2024
f45a2dc
Merge branch 'main' into pstlouis/bump-pyld
PatStLouis Feb 17, 2024
12d7928
Merge pull request #2788 from esune/chore/update-multiledger-docs
swcurran Feb 17, 2024
a26591c
Merge branch 'main' into pstlouis/bump-pyld
PatStLouis Feb 17, 2024
b59ec5b
Merge branch 'main' into pstlouis/change-validation-middleware-order
PatStLouis Feb 17, 2024
27bce43
Merge pull request #2795 from OpSecId/pstlouis/bump-pyld
swcurran Feb 17, 2024
d4b5f90
Merge branch 'main' into pstlouis/change-validation-middleware-order
PatStLouis Feb 17, 2024
8822abb
Merge branch 'main' into fix-deprecation-warnings
ff137 Feb 17, 2024
75e35c1
Merge pull request #2756 from ff137/fix-deprecation-warnings
swcurran Feb 18, 2024
41d1a87
Merge branch 'main' into 0.12.0rc1
swcurran Feb 18, 2024
af4b8d3
Add latest PRs to Changelog
swcurran Feb 18, 2024
78eef9d
Adding capability to publish docs to a documentation site
swcurran Feb 19, 2024
3f81e24
Merge branch 'main' into pstlouis/change-validation-middleware-order
PatStLouis Feb 19, 2024
adc5c67
Merge pull request #2796 from OpSecId/pstlouis/change-validation-midd…
swcurran Feb 19, 2024
0e0868f
Merge branch 'main' into 0.12.0rc1
swcurran Feb 19, 2024
c842a13
Add last merged PR, some tweaks to the mkdocs process
swcurran Feb 19, 2024
ac54189
Merge pull request #2799 from swcurran/0.12.0rc1
swcurran Feb 20, 2024
33a1c48
0.12.0rc1
swcurran Feb 20, 2024
de02ecc
Merge branch 'main' into 0.12.0rc1
swcurran Feb 20, 2024
96df9d0
Changlelog update
swcurran Feb 20, 2024
8d4add3
Merge remote-tracking branch 'origin/0.12.0rc1' into 0.12.0rc1
swcurran Feb 20, 2024
4d1f7fe
Merge pull request #2800 from swcurran/0.12.0rc1
swcurran Feb 20, 2024
2087915
Author subwallet setup automation (#2791)
jamshale Feb 20, 2024
c4f320f
Add anoncreds multitenant endorsement integration tests
jamshale Feb 20, 2024
f47719d
Get and create anoncreds profile when using anoncreds subwallet
jamshale Feb 20, 2024
63aac4d
Fix spelling / Reduce GHA endorsement tests slightly
jamshale Feb 20, 2024
cfa8cb5
Merge pull request #2801 from jamshale/feat/2767
ianco Feb 21, 2024
5ea2fa0
Merge branch 'main' into feat/2792
ianco Feb 21, 2024
8689339
Merge pull request #2803 from jamshale/feat/2792
ianco Feb 21, 2024
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
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# For details on how this file works refer to:
# - https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
# Maintain dependencies for GitHub Actions
# - Check for updates once a week
# - Group all updates into a single PR
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
groups:
all-actions:
patterns: [ "*" ]
6 changes: 3 additions & 3 deletions .github/workflows/blackformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Black Code Formatter Check
# The version of black should be adjusted at the same time dev
# dependencies are updated.
uses: psf/black@24.1.1
uses: psf/black@24.2.0
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: python

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/integrationtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
steps:
- name: checkout-acapy
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: acapy
#- name: run-von-network
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nigthly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
commits_today: ${{ steps.commits.outputs.commits_today }}
date: ${{ steps.date.outputs.date }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: print latest_commit
run: echo ${{ github.sha }}
- name: Get new commits
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ubuntu-latest
if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install
run: |
python -m venv env/
source env/bin/activate
python -m pip install --upgrade pip
python -m pip install .
- uses: pypa/gh-action-pip-audit@v1.0.0
- uses: pypa/gh-action-pip-audit@v1.0.8
with:
virtual-environment: env/
local: true
52 changes: 52 additions & 0 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: publish-docs

on:
push:
# Publish `main` as latest
branches:
- main

# Publish `v1.2.3` tags as releases
tags:
- v*

permissions:
contents: write

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetch all commits/branches
- uses: actions/setup-python@v4
with:
python-version: 3.x
- uses: actions/cache@v2
with:
key: ${{ github.ref }}
path: .cache
- name: Install Python dependencies
run: pip install -r ./mkdocs-requirements.txt
- name: Configure git user
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"

- name: Deploy docs
run: |
# Strip git ref prefix from version
echo "${{ github.ref }}"
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && ALIAS=$(echo $VERSION | sed -e 's/^v//')
# Copy all of the root level md files into the docs folder for deployment, tweaking the relative paths
for i in *.md; do sed -e "s#docs/#./#g" $i >docs/$i; done
# Populate overrides for the current version, and then remove to not apply if VERSION is main branch
echo -e "{% extends "base.html" %}\n\n{% block outdated %}\n You are viewing the documentation for ACA-Py Release $VERSION.\n{% endblock %}" >overrides/base.html
# If building from main, use latest as ALIAS
[ "$VERSION" == "main" ] && ALIAS=latest && rm overrides/base.html
echo $VERSION $ALIAS
mike deploy --push --update-aliases $VERSION $ALIAS
mike set-default latest
12 changes: 6 additions & 6 deletions .github/workflows/publish-indy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref || '' }}

Expand All @@ -61,34 +61,34 @@ jobs:
echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Image Metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
tags: |
type=raw,value=py${{ matrix.python-version }}-indy-${{ env.INDY_VERSION }}-${{ inputs.tag || github.event.release.tag_name }}

- name: Build and Push Image to ghcr.io
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true
context: .
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref || '' }}

Expand All @@ -58,34 +58,34 @@ jobs:
echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Image Metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
tags: |
type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}

- name: Build and Push Image to ghcr.io
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'hyperledger' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build a Docker image
run: docker build -t aries-cloudagent -f docker/Dockerfile .
- name: Run Snyk to check Docker image for vulnerabilities
Expand All @@ -28,6 +28,6 @@ jobs:
image: aries-cloudagent
args: --file=docker/Dockerfile
- name: Upload result to GitHub Code Scanning
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: snyk.sarif
8 changes: 4 additions & 4 deletions .github/workflows/tests-indy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ jobs:
name: Test Python ${{ inputs.python-version }} on Indy ${{ inputs.indy-version }}
runs-on: ${{ inputs.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache image layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache-test
key: ${{ runner.os }}-buildx-test-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-test-

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build test image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
load: true
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
name: Test Python ${{ inputs.python-version }}
runs-on: ${{ inputs.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
cache: 'pip'
Expand Down
Loading
Loading